Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/s

emacs-devel

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

Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/s

From: Paul Eggert

Subject: Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

Date: 2020年8月17日 09:11:21 -0700

User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0

On 8/17/20 8:58 AM, Eli Zaretskii wrote:

No, please try to avoid using "pull --rebase". It can have bad
consequences in some corner cases. Just "pull" is TRT

Yes, "pull --rebase" causes more trouble than it cures.

I avoid the problem by never committing anything to my local copy of the masterbranch unless I immediately push the result. Very occasionally someone else iscommitting at the same time so my push fails; in that case I delete my masterbranch, re-create it from upstream, and start over. So when I do "git pull" Inever need to rebase and I never need to merge. This is cleaner and simpler thanthe alternatives, at least for me.

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

Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, (continued)

Prev by Date: Re: Making GNUS continue to work with Gmail
Next by Date: Re: Warnings in mingw64 builds on master
Previous by thread: Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
Next by thread: Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
Index(es):
- Date
- Thread