"Philip Oakley" writes:
> From: "Junio C Hamano"
>
> Thanks for the replies. Let's see if I've got it...
>
>> "Philip Oakley" writes:
>>
>>> If I now understand correctly, the merge process flow is:
>>>
>>> * canonicalise content (eol, smudge-clean, $id, renormalise, etc)
>>> * diff the content
From: "Junio C Hamano"
Thanks for the replies. Let's see if I've got it...
"Philip Oakley" writes:
If I now understand correctly, the merge process flow is:
* canonicalise content (eol, smudge-clean, $id, renormalise, etc)
* diff the content (internal, or GIT_EXTERNAL_DIFF)
* apply the dif
"Philip Oakley" writes:
> If I now understand correctly, the merge process flow is:
>
> * canonicalise content (eol, smudge-clean, $id, renormalise, etc)
> * diff the content (internal, or GIT_EXTERNAL_DIFF)
> * apply the diff
> * if conflicts, only then use merge-driver/tool
>
> Would that be a
From: "Junio C Hamano"
"Philip Oakley" writes:
So I do not think this is not limited to "new file". Anything that
a tree-level three-way merge would resolve cleanly without having to
consult the content-level three-way merge will complete without
consulting the merge.ours.driver; per-file co
"Philip Oakley" writes:
>> So I do not think this is not limited to "new file". Anything that
>> a tree-level three-way merge would resolve cleanly without having to
>> consult the content-level three-way merge will complete without
>> consulting the merge.ours.driver; per-file content-level thr
From: "Junio C Hamano"
"Philip Oakley" writes:
The git book [1] and a few blog posts [2] show how to preserve files
which
are in the current branch against changes that are on the branch being
merged in.
e.g. (from [2])
echo ' merge=ours' >> .gitattributes && # commit
git config --global m
"Philip Oakley" writes:
> The git book [1] and a few blog posts [2] show how to preserve files which
> are in the current branch against changes that are on the branch being
> merged in.
>
> e.g. (from [2])
>
> echo ' merge=ours' >> .gitattributes && # commit
> git config --global merge.ours.driv
The git book [1] and a few blog posts [2] show how to preserve files which
are in the current branch against changes that are on the branch being
merged in.
e.g. (from [2])
echo ' merge=ours' >> .gitattributes && # commit
git config --global merge.ours.driver true
(test) $ git checkout demo
(de
8 matches
Mail list logo