From: Caleb Cushing <xenoterracide@gmail.com>
To: git@vger.kernel.org
Subject: merge, keeping the remote as a new file?
Date: Sun, 1 Mar 2009 19:16:10 -0500 [thread overview]
Message-ID: <81bfc67a0903011616w32ebdad9ofc096f5d1fd3174a@mail.gmail.com> (raw)
I have an unmerged file... the resolution I'd like to have is
checkout the local one for the current file name. take the remote
version and give it a new file name. what's the best way to do that?
--
Caleb Cushing
http://xenoterracide.blogspot.com
next reply other threads:[~2009-03-02 0:19 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-02 0:16 Caleb Cushing [this message]
2009-03-02 4:11 ` merge, keeping the remote as a new file? Jeff King
2009-03-02 6:36 ` Charles Bailey
2009-03-02 6:45 ` Jeff King
2009-03-02 6:59 ` Björn Steinbrink
2009-03-02 7:04 ` Jeff King
2009-03-02 13:05 ` Jay Soffian
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=81bfc67a0903011616w32ebdad9ofc096f5d1fd3174a@mail.gmail.com \
--to=xenoterracide@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).