2. FreshRSS-Android
3. Changes

Rebasing (1/4)
dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream
Rebasing (2/4)
error: could not apply b9ce1db... Fix release script
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b9ce1db... Fix release script
Auto-merging Jenkinsfile-release
CONFLICT (content): Merge conflict in Jenkinsfile-release
 (1)

5 months ago

Rebasing (1/4)
dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream
Rebasing (2/4)
error: could not apply b9ce1db... Fix release script
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b9ce1db... Fix release script
Auto-merging Jenkinsfile-release
CONFLICT (content): Merge conflict in Jenkinsfile-release
 (1)

5 months ago

Rebasing (1/4)
dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream
Rebasing (2/4)
error: could not apply b9ce1db... Fix release script
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b9ce1db... Fix release script
Auto-merging Jenkinsfile-release
CONFLICT (content): Merge conflict in Jenkinsfile-release
 (1)

5 months ago

Rebasing (1/4)
dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream
Rebasing (2/4)
error: could not apply b9ce1db... Fix release script
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b9ce1db... Fix release script
Auto-merging Jenkinsfile-release
CONFLICT (content): Merge conflict in Jenkinsfile-release
 (1)

5 months ago

Rebasing (1/4)
dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream
Rebasing (2/4)
error: could not apply b9ce1db... Fix release script
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b9ce1db... Fix release script
Auto-merging Jenkinsfile-release
CONFLICT (content): Merge conflict in Jenkinsfile-release
 (1)

5 months ago

Rebasing (1/4)
dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream
Rebasing (2/4)
error: could not apply b9ce1db... Fix release script
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b9ce1db... Fix release script
Auto-merging Jenkinsfile-release
CONFLICT (content): Merge conflict in Jenkinsfile-release
 (1)

5 months ago

Rebasing (1/4)
dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream
Rebasing (2/4)
error: could not apply b9ce1db... Fix release script
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b9ce1db... Fix release script
Auto-merging Jenkinsfile-release
CONFLICT (content): Merge conflict in Jenkinsfile-release
 (1)

5 months ago

Rebasing (1/4)
dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream
Rebasing (2/4)
error: could not apply b9ce1db... Fix release script
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b9ce1db... Fix release script
Auto-merging Jenkinsfile-release
CONFLICT (content): Merge conflict in Jenkinsfile-release
 (1)

5 months ago

Rebasing (1/4)
dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream
Rebasing (2/4)
error: could not apply b9ce1db... Fix release script
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b9ce1db... Fix release script
Auto-merging Jenkinsfile-release
CONFLICT (content): Merge conflict in Jenkinsfile-release
 (1)

5 months ago

Rebasing (1/4)
dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream
Rebasing (2/4)
error: could not apply b9ce1db... Fix release script
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b9ce1db... Fix release script
Auto-merging Jenkinsfile-release
CONFLICT (content): Merge conflict in Jenkinsfile-release
 (1)

5 months ago

Rebasing (1/4)
dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream
Rebasing (2/4)
error: could not apply b9ce1db... Fix release script
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b9ce1db... Fix release script
Auto-merging Jenkinsfile-release
CONFLICT (content): Merge conflict in Jenkinsfile-release
 (1)

5 months ago

Could not merge the repository. 5 months ago

Could not merge the repository. 5 months ago

Rebasing (1/4)
dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream
Rebasing (2/4)
error: could not apply b9ce1db... Fix release script
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b9ce1db... Fix release script
Auto-merging Jenkinsfile-release
CONFLICT (content): Merge conflict in Jenkinsfile-release
 (1)

5 months ago

fatal: could not read Username for 'https://gitlab.com': terminal prompts disabled
 (128)

5 months ago

fatal: could not read Username for 'https://gitlab.com': terminal prompts disabled
 (128)

5 months ago

Rebased repository 5 months ago

fatal: could not read Username for 'https://gitlab.com': terminal prompts disabled
 (128)

5 months ago

fatal: could not read Username for 'https://gitlab.com': terminal prompts disabled
 (128)

5 months ago

fatal: could not read Username for 'https://gitlab.com': terminal prompts disabled
 (128)

5 months ago