* Re: How can I merge some files rather than all files modified on one branch to my branch?
2009-03-02 9:19 How can I merge some files rather than all files modified on one branch to my branch? Emily Ren
@ 2009-03-02 10:04 ` Junio C Hamano
2009-03-03 3:10 ` Boyd Stephen Smith Jr.
1 sibling, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2009-03-02 10:04 UTC (permalink / raw)
To: Emily Ren; +Cc: git
Emily Ren <lingyan.ren@gmail.com> writes:
> I want to merge some files rather than all files modified on one
> branch to my branch, how can I do?
In general, you do not want to, simply because the result is not really a
merge.
You are rejecting one of the two primary advantages git brings over other
traditional systems: merge tracking [*1*]..
But if you really wanted to, here is how.
Suppose you are on branch A, and if you merged branch B in a natural way
it would bring in changes to file1 and file2. But you do not want any
change to file2. You can do this:
(1) Start from a clean state. No uncommitted changes (if you have some,
stash them away first). Merge the branch the usual way:
$ git merge B
(2) (1) may get conflicts in file1 and/or file2. Resolve the conflicts
only in the file(s) you are interested in (in this example file1).
Ignore conflicts in files you do not want to get changed in this
merge. And then conclude the merge with:
$ git commit -a
This step is necessary only if (1) does not cleanly merge; otherwise
it would have created a merge commit already.
(3) You did not want changes to certain paths (in this example, file2) in
the "merge", but we recorded such change in the previous step, so you
amend it. At this point HEAD is the merge you created, and HEAD^ is
before you started the merge. You want the contents of file2 before
the merge happened, i.e. from HEAD^:
$ git checkout HEAD^ file2
$ git commit --amend
The result would record a "merge" that ignores what B did to file2.
The reason you do not want to do this is because git tracks merges.
Suppose you have this topology:
A---M
/ /
---o---C---B
A is where you were before this "merge", B is the other branch, and M is
the result of the "merge".
Now, suppose branch B later improves on what it has done, and now what the
branch has is satisfactory for your needs. There is no reason you would
not want to have any of its improvements. You try to merge again.
A---M-----------?
/ / /
---o---C---B---D---E---F
Because you declared (when you made the "merge" at M) that anything B did
to file2 was unwanted to your branch, git remembers that declaration. The
information is used when computing the merge between M and F. That is
what merge tracking is.
Perhaps changes to file2 when you inspected B were not good enough, but
with improvements made in D, E and/or F it may now be perfect. But you
are denying to take this whole sequence of changes, and the merge you
would create between M and F will have only what D/E/F did to file2;
it won't contain what B did. That makes the sequence of changes B-D-E-F
did to file2 incomplete and inconsistent.
If you are lucky, it will result in huge conflicts and you will notice the
situation. But if you are not lucky, it may merge cleanly, but because
D/E/F builds on top of what B did, which possibly was half-baked back
then, for the merge result to work as well as F does, you need to have
what B did. But you won't have it, because you already rejected it at M.
Two advises are:
(1) To avoid problems in future merges, do not record the result as a
"merge". You want to cherry-pick partially; in other words, you would
want to record this topology when you create this "merge" (which is
not a merge):
A---M
/
---o---C---B
with the same tree as you would have recorded in the first picture.
For that, I think you could run "git merge --squash B" in step (1) in
the main part of this message.
(2) More importantly, your wish to take only one but not the other part
of B is a strong indication that the branch B is doing too many
things, either in a single commit or either on a single branch or
both. Separate these distinct bits into different topic branches so
that each individual bits can be independently merged to other
branches.
[Footnote]
*1* The other advantage is distributedness, which is "separation between
the act of committing and the act of publishing".
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: How can I merge some files rather than all files modified on one branch to my branch?
2009-03-02 9:19 How can I merge some files rather than all files modified on one branch to my branch? Emily Ren
2009-03-02 10:04 ` Junio C Hamano
@ 2009-03-03 3:10 ` Boyd Stephen Smith Jr.
2009-03-03 3:56 ` Emily Ren
1 sibling, 1 reply; 5+ messages in thread
From: Boyd Stephen Smith Jr. @ 2009-03-03 3:10 UTC (permalink / raw)
To: Emily Ren; +Cc: git
[-- Attachment #1: Type: text/plain, Size: 1351 bytes --]
On Monday 02 March 2009 03:19:05 Emily Ren wrote:
> I want to merge some files rather than all files modified on one
> branch to my branch, how can I do?
In addition to what Junio suggested, I'll offer another method, assuming the
branch you are merging from is not yet published:
(1) Rewrite the history of the to-be-merged branch so that all the changes to
the files you want occur "before" and in separate commits from the file you
want to ignore. So the current tree:
A-->B-->C (yours)
\
->D-->E (theirs)
becomes:
A-->B-->C (yours)
\
->D1-->E1-->D2-->E2 (theirs)
with D1 and D2 being the separate parts of commit D and similarly for E1 and
E2.
(2) Merge in the rewritten history, but only the part that you want, giving:
A-->B-->C--->F (yours)
\ /
->D1-->E1-->D2-->E2 (theirs)
This preserves the full intent of what you are trying to do, a partial merge.
If you merge "theirs" in fully at some point in the future, you shouldn't see
any conflicts arising from not recording the merge or missing changes arising
from recording a full merge that did not happen.
--
Boyd Stephen Smith Jr. ,= ,-_-. =.
bss@iguanasuicide.net ((_/)o o(\_))
ICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-'
http://iguanasuicide.net/ \_/
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread