On Tue, Nov 17, 2015 at 10:02:03AM -0800, mike wrote: > Hi, > > I have had a branch, feature_xyz, for a long time ( yes I know I should not > but it was not my call). Problem is I have not updated it with changes from > master. So I started to do a regular rebase ( i want to keep history): > > git fetch origin master > git rebase origin/master > > After a while with conflicting patches (over 30...) I guess that there must > be an easier way to do this, > > So anyone out there with an better idea I am open to new ideas. What do you > suggest?
Maybe git-imerge, <https://github.com/mhagger/git-imerge> can help out. I've only used it once or twice, but found it very nice for performing large merges. /M -- Magnus Therning OpenPGP: 0xAB4DFBA4 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus The day after tomorrow is the third day of the rest of your life. -- 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.
Description: PGP signature