Any suggestions... hints ? Thanks, Marco
On Friday, June 4, 2021 at 4:54:27 PM UTC+2 Marco Giuliano wrote: > Hi All > > I'm facing a strange anomaly during rebase. I don't think the cause it the > rebase itself, but most likely the rebase command is unveiling something > wrong that happene before (maybe during a squash?). > > I'll try to explain what happens because unfortunately I cannot share more > information since it's confidential. > > I have the following repository status: > > 2 (BRANCH X) > | > | 4 (BRANCH Y) (HEAD) > | | > | 3 > | / > |/ > 1 > | > | > (...) > > What I'm trying to do is rebasing branch Y on branch X, with the command: > git rebase X > > The anomaly is that among other expected conflicts, also two files (fileA, > fileB) appear modified in both branches, but those two files have not been > modified in any of the 4 commits you see in the graph above! > The anomaly appears only with the config setting rebase.backend=apply, > while not with rebase.backend=merge (*). > > As I said in the beginning, this might not be caused by rebase command > itself, but rather by some previous operations which might have > accidentally "broken" something and that the rebase simply makes them > appear. > You need to know that commit 4 is the result of several squash and > reordering of multiple commits; is it possible that some of those > operations have created some "leftovers" ? > > To be honest, this is destabilizing; now I'm not even sure those changes > shouldn't actually be in the history... I know this is difficult without > seeing the actual repository, but could you just give me some advice or > point me to the place where I can investigate ? > > (I'm using git 2.31.1.windows1) > > Thanks in advance for any help, > Best Regards, > Marco > > *(*) I was using version 2.25 when the anomaly appeared; so I decided to > upgrade git to 2.31 and the anomaly disappeared. Investigating the release > notes, I noticed that rebase.backend default value changed from apply to > rebase from version 2.26.0.* > > > > > > > > > > > > > > > > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/e6a161b8-8f8f-4aea-a0a0-332c2254e73an%40googlegroups.com.
