From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Patrick Doyle <wpdster@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: How to create & switch to a branch after changes have already been made?
Date: Tue, 3 Jul 2007 12:10:06 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0707031210020.4071@racer.site> (raw)
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".
Ciao,
Dscho
next prev parent reply other threads:[~2007-07-03 11:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-03 2:18 How to create & switch to a branch after changes have already been made? Patrick Doyle
2007-07-03 2:49 ` Patrick Doyle
2007-07-03 11:10 ` Johannes Schindelin [this message]
2007-07-03 14:04 ` Patrick Doyle
-- strict thread matches above, loose matches on Subject: below --
2007-07-03 3:05 linux
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0707031210020.4071@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=wpdster@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).