From: "Patrick Doyle" <wpdster@gmail.com>
To: git@vger.kernel.org
Subject: Re: How to create & switch to a branch after changes have already been made?
Date: Mon, 2 Jul 2007 22:49:47 -0400 [thread overview]
Message-ID: <e2a1d0aa0707021949k181f9042j26ebd124f61ca1ae@mail.gmail.com> (raw)
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
next prev parent reply other threads:[~2007-07-03 2:49 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 [this message]
2007-07-03 11:10 ` Johannes Schindelin
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=e2a1d0aa0707021949k181f9042j26ebd124f61ca1ae@mail.gmail.com \
--to=wpdster@gmail.com \
--cc=git@vger.kernel.org \
/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).