aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/res/values/strings.xml
diff options
context:
space:
mode:
authorDanilo M. <danix@danix.xyz>2026-11-02 12:16:42 +0100
committerDanilo M. <danix@danix.xyz>2026-11-02 12:16:42 +0100
commite33c0ada6e09d309938325a5e6d914514e14de72 (patch)
treecdb3c4dabbe75380970930f801475e6578a6d7d6 /app/src/main/res/values/strings.xml
parentc9a53ac6c1b59572f8d6cba8f41e6fcd242c4fa1 (diff)
downloadHardenedPass-e33c0ada6e09d309938325a5e6d914514e14de72.tar.gz
HardenedPass-e33c0ada6e09d309938325a5e6d914514e14de72.zip
fix(git): keep the branch name when breaking out of a failed rebase
When a pull with rebase stops on a conflict, HEAD is detached and getCurrentBranch() returned null. "Abort rebase and push new branch" then pushed the local commits to "conflicting-null-<time>" and failed to switch back with "Branch name <null> is not allowed", leaving the repository on the conflict branch. Fall back to the branch JGit records in rebase-merge/head-name (or rebase-apply/head-name) while a rebase is in progress. Found while driving the conflict flow on an emulator against the e2e test server; verified there: the edit is pushed to conflicting-master-<time> and the operation completes. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Diffstat (limited to 'app/src/main/res/values/strings.xml')
0 files changed, 0 insertions, 0 deletions