From: jemmyw <jeremy@boost.co.nz>
To: git@vger.kernel.org
Subject: retrospective move
Date: Wed, 4 Feb 2009 00:43:36 -0800 (PST) [thread overview]
Message-ID: <21826423.post@talk.nabble.com> (raw)
Hi. Awhile ago I copied some files in my local repo then commited. In another
commit I deleted the original files, so essentially I did a mv that git
doesn't know about. Now I'm trying to merge from another branch where
changes have happened to the files in their original locations, and it's
making the merge somewhat difficult. Is there a way to ease this?
--
View this message in context: http://www.nabble.com/retrospective-move-tp21826423p21826423.html
Sent from the git mailing list archive at Nabble.com.
next reply other threads:[~2009-02-04 8:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-04 8:43 jemmyw [this message]
2009-02-04 9:17 ` retrospective move Thomas Rast
2009-02-04 10:31 ` Santi Béjar
2009-02-04 12:33 ` Thomas Rast
2009-02-04 12:57 ` Santi Béjar
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=21826423.post@talk.nabble.com \
--to=jeremy@boost.co.nz \
--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).