From: chirin Date: Tue, 27 Dec 2011 07:02:52 GMT Subject: Re: Git beginner - Need help understanding Message-ID: <1324969372444-7129429.post@n2.nabble.com> In-Reply-To: From what I understand, your scenario is exactly what I expect. Which is why when I asked around my colleagues, no one was able to explain why I'm having this issue. As per your scenario: # A changes hello.txt # Going into B (who has not done anything to hello.txt) git pull --> merge conflict on hello.txt git commit git pull --> OK Would going through Gerrit have anything to do with it? I've compared git config -l with the others but they are the same (aside from remote.origin.url which has our own gerrit userid). Dov Grobgeld wrote > > The best way of understanding and also of asking questions, is if you > can reproduce the steps of exactly what you want and don't understand > by a sequence of commands like so: > >     # First create a bare repository >     mkdir R >     cd R >     git init --bare . > >     # Clone it into A >     git clone R A > >     # Clone it into B >     git clone R B > >     # Now start doing changes for A and B, pulling and pushing into R >     cd A >     echo "Change #1" > hello.txt >     git add hello.txt >     git commit -m 'Commit #1' >     git push origin master > >     # Get into B >     cd ../B >     git pull >     echo "Change #2" >> hello.txt >     git commit -a -m 'Commit #2' >     git push > >     # Get into A and pull the changes done by B >     cd ../A >     git pull > > In this sequence, which fulfills the scenario that you described, > there are no conflicts. So I suggest that you try to change the > command sequence to illustrate what you don't understand and ask > again. > > Regards, > Dov > -- View this message in context: http://git.661346.n2.nabble.com/Git-beginner-Need-help-understanding-tp7129186p7129429.html Sent from the git mailing list archive at Nabble.com.