Re: Stupid git!

[Steinar Bang <sb@dod.no>]

>>>>> Dmitry Gutov <dgutov@yandex.ru>:

> Hi Alan,
> On 09/14/2015 02:09 PM, Alan Mackenzie wrote:

>> What confused me is that git aborted the merge despite there being no
>> conflicts (i.e., nothing requiring the use of an editor to resolve).

> Indeed, I don't usually see that.

Actually, I've never seen that.

> Hence my question about --no-commit in your gitconfig.

> But others' suggestion that it might be because of 'git add'
> beforehand is also plausible. I never do that, because it makes little
> sense.

Hm... easy enough to try.

 cd ~/git
 mkdir add-test
 cd add-test
 git init
 echo "Hello" >hello.txt
 git add hello.txt
 git commit -m "Added hello file"
 mkdir ../add-test.git
 cd ../add-test.git
 git init --bare
 cd ../add-test
 git remote add origin ../add-test.git
 git push -u origin HEAD
 cd ..
 git clone ./add-test.git add-test2
 cd add-test
 echo "Hello world!" >hello.txt
 git add hello.txt
 git commit -m "Add a new commit that can be pulled in the other clone"
 git push
 cd ../add-test2
 git add hello.txt
 git pull

Nah... the result of the final command:

~/git/add-test2$ git pull
remote: Counting objects: 5, done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From c:/Users/sbang/git/./add-test
   1887bde..446444d  master     -> origin/master
Updating 1887bde..446444d
Fast-forward
 hello.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Ie. no conflict.

~/git/add-test2$ git --version
git version 1.9.4.msysgit.1

I tried a variant with "git add ." before pull, but I got the same
result, ie. no conflict, no merge.