[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Missing changes in merges from emacs-25 to master

From: Eli Zaretskii
Subject: Re: Missing changes in merges from emacs-25 to master
Date: Tue, 22 Mar 2016 20:33:36 +0200

> Cc: address@hidden
> From: Paul Eggert <address@hidden>
> Date: Tue, 22 Mar 2016 11:21:04 -0700
> On 03/22/2016 10:03 AM, Eli Zaretskii wrote:
> >> "git rebase" should do the trick.
> > We've been through this: "git rebase" will cause much worse trouble if
> > you have local merge-commits from feature branches.  So I at least
> > will never use "git rebase" unless I have no other choice.
> For complex clashes such as the one you describe, you might try redoing 
> the failed push from a clean new master branch rather than attempting 
> "git pull / git push".  Something like this:
> $ git push
> [ fails due to somebody else committing in the meantime ]
> $ git branch -m master master-clashed
> $ git branch --track master origin/master
> $ git checkout master
> $ git pull
> [ now, merge your changes again ]
> $ git push

Thanks, but I don't see why I should bother with such complications,
when no one cares about the DAG keeping a clear "mainline".

reply via email to

[Prev in Thread] Current Thread [Next in Thread]