[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: Paul Eggert
Subject: Re: Missing changes in merges from emacs-25 to master
Date: Tue, 22 Mar 2016 11:21:04 -0700
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0

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

reply via email to

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