[git-users] Re: Git Merge Conflict

2010-10-27 Thread Chandu80
Thank You Very much :) On Oct 26, 3:38 pm, Konstantin Khomoutov khomou...@gmail.com wrote: On Oct 26, 11:26 am, Chandu80 chandu.she...@gmail.com wrote: I have two files rpc-devexprcpseq-nav.rb and readme.txt. My workflow is as follows. [...] Auto-merging lib/rpc-devexprcpseq-nav.rb

[git-users] Re: Git Merge Conflict

2010-10-26 Thread Konstantin Khomoutov
On Oct 26, 11:26 am, Chandu80 chandu.she...@gmail.com wrote: I have two files rpc-devexprcpseq-nav.rb and readme.txt. My workflow is as follows. [...] Auto-merging lib/rpc-devexprcpseq-nav.rb CONFLICT (content): Merge conflict in lib/rpc-devexprcpseq-nav.rb Auto-merging readme.txt CONFLICT