[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: Stefan Monnier
Subject: Re: Missing changes in merges from emacs-25 to master
Date: Tue, 22 Mar 2016 12:52:48 -0400
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux)

>> >   . Phillip then said "git pull", followed by "git push".
>> That's a problem in itself, since it leads to annoying commit diffs that
>> repeat other things, and it changes "git log" ordering in confusing ways
>> (makes it seem like mainline's development is Philip's and when happened
>> on master during this time was done on a branch).
> Indeed.  But sometimes this cannot be avoided, because no matter how
> quick you are, there's always a chance that someone else pushes
> between your local commit and your push.  The probability of this
> could be brought down significantly by "git pull" before the local
> commit, but it cannot be eliminated altogether.

"git rebase" should do the trick.


reply via email to

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