From: Patrick Doyle <wpdster@gmail.com>
Date: Tue, 03 Jul 2007 02:49:47 GMT
Subject: Re: How to create & switch to a branch after changes have already been made?
Message-ID: <e2a1d0aa0707021949k181f9042j26ebd124f61ca1ae@mail.gmail.com>
In-Reply-To: <e2a1d0aa0707021918mb335856j278b3128203a793a@mail.gmail.com>

Hmmm...
One thing I might tell the hypothetical person is to temporarily
delete or rename the new version of "somefile", so that the merge
could complete with problems, and then recreate or rename it back.
That would probably allow the hypothetical person to continue his/her
work.

--wpd