[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: Phillip Lord
Subject: Re: Missing changes in merges from emacs-25 to master
Date: Thu, 24 Mar 2016 07:18:41 +0000
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux)

Lars Magne Ingebrigtsen <address@hidden> writes:

> Eli Zaretskii <address@hidden> writes:
>> We've been through this: "git rebase" will cause much worse trouble if
>> you have local merge-commits from feature branches. 
> That's true, but that's a quite unusual thing to be doing.  ("Unusual"
> as in "most of the time most of the people who work on Emacs won't be
> doing that".)  In this instance, if he had done
> "git pull --rebase; git push" then no merge commit would have been
> pushed, and things would generally be less confusing.
> That rebase/push thing is what I do 99.9% of the time, and its the least
> noisy you can be when doing normal stuff.

If I remember correctly, I think I did the commit, but forgot to push,
till the next day. Once I got into the merge commit, my lack of git
expertise meant I couldn't work out how to get out of it again.

Mostly I develop with feature branches, so don't normally get this
problem. Ah well, live and learn.


reply via email to

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