Brian Foster wrote:
On Monday 30 March 2009 14:19:11 Andreas Ericsson wrote:
Brian Foster wrote:
(4) Tag the result `like-this';
(5) Checkout our.21; and
(6) Merge with `like-this'.
Merge is not necessary.
<Shrugs/> I'll going to try in both ways (with and without
merging) to better understand just what the results are like.
If you get the tree into the state you want and simply want to
connect the histories, you can do
git merge -s ours $other_branch
which will record the tree from the current commit as the tree
for the merge-commit (ie, all changes from $other_branch are
thrown away, and the merge always succeeds without conflicts).
--
Andreas Ericsson andreas.ericsson@xxxxxx
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
Considering the successes of the wars on alcohol, poverty, drugs and
terror, I think we should give some serious thought to declaring war
on peace.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
