|
From: | Stefan Monnier |
Subject: | Re: Strange response after merge from upstream |
Date: | Wed, 02 Dec 2009 09:29:30 -0500 |
User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) |
> `pull' never merges because there is nothing that can cause conflicts. Oh, so that's the misconception from which comes the stupid idea that --show-base would only apply to merge but not to pull? FYI, this is not true: it has to merge the incoming patches with the local uncommitted changes. Stefan
[Prev in Thread] | Current Thread | [Next in Thread] |