You might try 'imerge'. Git-imerge basically can construct a rebase, and it actually looks at all the commits along the way, rather than only the heads and merge-base.
On 2017-08-28, at 3:28 AM, Marc Haber <mh+git-us...@zugschlus.de> wrote: > On Mon, Aug 28, 2017 at 11:26:06AM +0300, Konstantin Khomoutov wrote: >> On Sat, Aug 26, 2017 at 12:37:55PM +0200, Marc Haber wrote: >>> But when I try to git rebase fan upon master, I get the same file that >>> is even in the diff between msater and fan over and over again. I guess >>> that git rebase goes back to commit 2357bcc where fan was branched off >>> master and tries to reapply all changes one by one, most of which have >>> been rolled back since then or have already been done in master. I have >>> merged msater into fan multiple times in the hope that this would make >>> rebasing possible again, but to no avail. >> [...] >> >> Isn't this the case covered by this bit from the git-merge(1) manual >> page? >> >> | With the strategies that use 3-way merge (including the default, >> recursive), >> | if a change is made on both branches, but later reverted on one of the >> | branches, that change will be present in the merged result; some people >> | find this behavior confusing. It occurs because only the heads and the >> merge >> | base are considered when performing a merge, not the individual commits. >> | The merge algorithm therefore considers the reverted change >> | as no change at all, and substitutes the changed version instead. >> >> I don't have a clear idea of how to deal with this properly. > > I guess that this does not work nicely with rebase since rebase tries to > apply each commit single in turn, which causes merge conflicts over and > over again. > >> One way would be to merge with --no-commit then manually fixing up the >> results (by picking the correct contents for particular files using >> `git checkout`) and then staging the changes and comitting. > > Only the issue is that I don't want to merge, I want to rebase. > > Greetings > Marc > > -- > ----------------------------------------------------------------------------- > Marc Haber | "I don't trust Computers. They | Mailadresse im Header > Leimen, Germany | lose things." Winona Ryder | Fon: *49 6224 1600402 > Nordisch by Nature | How to make an American Quilt | Fax: *49 6224 1600421 > > -- > 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. > For more options, visit https://groups.google.com/d/optout. --- Entertaining minecraft videos http://YouTube.com/keybounce -- 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. For more options, visit https://groups.google.com/d/optout.
