Hello,
Consider the following use case:
git init
seq 0 9 f
git add f
git commit -m start
git checkout -b b1
perl -pi -e 's,0,b1,' f
git commit -a -m b1
git checkout -b b2
perl -pi -e 's,9,b2,' f
git commit -a -m b2
git checkout master
git merge b1 b1
As the
Marcin Owsiany mar...@owsiany.pl writes:
the index file saves and restores with all this information, so you
can merge things incrementally,
which I took to mean that I can read from multiple trees one by one
before writing the tree.
That incrementally refers to after a three-way merge
2 matches
Mail list logo
