Re: Understanding a recent commit in emacs-25 branch [ed19f2]

[Eli Zaretskii]

> From: Ingo Lohmar <address@hidden>
> Date: Sun, 03 Apr 2016 14:30:27 +0200
> Cc: Emacs developers <address@hidden>,
>       Kaushal Modi <address@hidden>
> 
> Single caveat: Do NOT start a merge when you have uncommited changes.
> If you want, do 'git stash' first to recover them later.

I disagree with this caveat.  There's no reason to frighten people
like that, as doing such merges will work most of the time.

> In this case, you have to learn about rebase, as in 'git rebase
> origin/master'.

"git rebase" is a bad idea when merging a long-lived feature branch,
so please don't advise this to users who are evidently not Git
experts.