Hello Eugen, Friday, November 6, 2020, 8:32:13 PM, you wrote: > Hi > I try to rebase, get conflicts. So I decide to --abort > After --abort I expect state before rebasing, but I get conflicts. > I supposet this is because `git rebase` switches to not branch and > --abort can not return to branch I was on before rebasing > Is this a bug? > kes@work ~/t/lib/MaitreD $ git rebase dev local/dev > Created autostash: 566876c8 > warning: Cannot merge binary files: share/ChangeAgreement.docx > (HEAD vs. f2442d9a... Update Docs.pm) > Auto-merging share/ChangeAgreement.docx > CONFLICT (content): Merge conflict in share/ChangeAgreement.docx > error: could not apply f2442d9a... Update Docs.pm > 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 f2442d9a... Update Docs.pm > kes@work ~/t/lib/MaitreD $ git rebase --abort > Applying autostash resulted in conflicts. > Your changes are safe in the stash. > You can run "git stash pop" or "git stash drop" at any time. > Here is a tree before rebasing: >> a9597aaa (HEAD -> dev) Use DateTime with correct timezone >> 822ff801 Add link to Podio into mail >> 65575afe Update Docs.pm > | < e0003861 (local/dev) Update podio.t - test person contacts > | < 28ab8630 Create docdate if agreement is new and update test for that > | < 208ead68 Specified checking of person > | < f2442d9a Update Docs.pm > |/ > o 6d9c2159 (xtucha/test, xtucha/dev) Leave only one example in month > Here is conflicts: > HEAD detached from 142c1b15 > Changes to be committed: > (use "git restore --staged <file>..." to unstage) > 1 modified: ../../Makefile > 2 modified: ../../etc/maitre_d.development.conf > 3 modified: Command/bank_statement.pm > 4 modified: Command/invoicing.pm > 5 modified: Command/reminding.pm > 6 modified: Controller/Cart.pm > 7 modified: Controller/Saldo.pm > Unmerged paths: > (use "git restore --staged <file>..." to unstage) > (use "git add <file>..." to mark resolution) > 8 both modified: Controller/Podio.pm > $ git --version > git version 2.28.0 history after --abort: * e0003861 (HEAD, local/dev) Update podio.t - test person contacts * 28ab8630 Create docdate if agreement is new and update test for that * 208ead68 Specified checking of person * f2442d9a Update Docs.pm * 6d9c2159 (xtucha/test, xtucha/dev) Leave only one example in month history before rebase: a9597aaa (HEAD -> dev) Use DateTime with correct timezone -- Best regards, Eugen Konkov
