From: Johannes Sixt <j.sixt@viscovery.net>
To: Johannes Schneider <mailings@cedarsoft.com>
Cc: git <git@vger.kernel.org>
Subject: Re: How to resolve conflict: Moved away vs. created new file with same name
Date: Tue, 19 Jan 2010 12:55:23 +0100 [thread overview]
Message-ID: <4B559DAB.9030605@viscovery.net> (raw)
In-Reply-To: <4B559328.2010206@cedarsoft.com>
Johannes Schneider schrieb:
> TopicA:
>
> created a directory "client" containing a pom.xml and several source files.
>
>
> TopicB:
>
> created a directory "client" containing a pom.xml (different file than
> the one in TopicA).
> Created several subdirectories (client1, client2).
>
> ...
> So I am trying to mimic the change in TopicA:
>
> cd client
> mkdir client3
> mv pom.xml client3
> mv src client3
> ...commit...
Did you do this during the merge? If not, go back to TopicA and redo it;
then you avoid the conflict during the merge.
> Okay, so far so good. Now I try to merge TopicA and TopicB which fails.
> Of course Git doesn't understand that "client/pom.xml" in TopicA and
> TopicB are not related.
> I want to end with to the file from TopicA ending in
> "client/client3/pom.xml" and the file from TopicB in "client/pom.xml".
During the merge without the fixup suggested above:
git rm -f client/client3/pom.xml
git checkout TopicA -- client/pom.xml
git mv client/pom.xml client/client3/pom.xml
git checkout TopicB -- client/pom.xml
but it leaves you with an ugly history, and it would be far better to fix
up TopicA before the merge.
-- Hannes
next prev parent reply other threads:[~2010-01-19 11:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-19 11:10 How to resolve conflict: Moved away vs. created new file with same name Johannes Schneider
2010-01-19 11:55 ` Johannes Sixt [this message]
[not found] ` <4B55C481.90406@cedarsoft.com>
2010-01-19 14:55 ` Johannes Sixt
2010-01-19 16:46 ` Johannes Schneider
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=4B559DAB.9030605@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=mailings@cedarsoft.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).