From: Jon Smirl <jonsmirl@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: Wrong conflicts on file splits
Date: Mon, 4 May 2009 08:53:11 -0400 [thread overview]
Message-ID: <9e4733910905040553u377ab11n1609d980021be498@mail.gmail.com> (raw)
I keep running into this problem, is there anything I can do to make
it better? I'm using stgit but this is a problem in git itself.
I have a patch that splits file A into two files, A and B.
Now I merge with another tree and bring in a one line fix to A.
The fix touches the pre-split file A in a section that is going to end up in B.
Next I re-apply the patch that splits A into A and B.
This results in a large conflict in the post split file A.
And no patch being applied to file B which is where the fix belongs.
Repeat this process with a multi-line fix and the whole automated
merge process breaks down and I have to carefully figure everything
out by hand.
The merge process seems to be unaware of the newly created file B. No
patches or conflict ever end up in it.
--
Jon Smirl
jonsmirl@gmail.com
next reply other threads:[~2009-05-04 12:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-04 12:53 Jon Smirl [this message]
2009-05-04 13:27 ` Wrong conflicts on file splits Michael J Gruber
2009-05-04 13:42 ` Jon Smirl
2009-05-04 13:49 ` Michael J Gruber
2009-05-04 13:52 ` Jon Smirl
2009-05-04 14:54 ` Michael J Gruber
2009-05-04 15:30 ` Jon Smirl
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=9e4733910905040553u377ab11n1609d980021be498@mail.gmail.com \
--to=jonsmirl@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).