Re: How to create & switch to a branch after changes have already been made?

From

Johannes Schindelin <johannes.schindelin@gmx.de>

Date

Jul 3, 2007, 11:10 UTC

Message-ID

<Pine.LNX.4.64.0707031210020.4071@racer.site>

In-Reply-To

<e2a1d0aa0707021949k181f9042j26ebd124f61ca1ae@mail.gmail.com>

Hi,

On Mon, 2 Jul 2007, Patrick Doyle wrote:

> 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.

You could also say "git checkout -f newbranch".