[git-users] Re: Git Merge Conflict

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

[git-users] Git Merge Conflict

2010-10-26 Thread Chandu80
Hello All, I have two files rpc-devexprcpseq-nav.rb and readme.txt. My workflow is as follows. 1.Checkout from master to work branch. 2.While in the work branch,delete data from rpc-devexprcpseq-nav.rb and paste the same data with indentation.(Note here that nothing has been changed in the code,onl

[git-users] git pull error

2010-10-07 Thread Chandu80
Hello All, I fetched a remote repository(git fetch) and pulled(git pull) the contents from it successfully. Now I change a file in the working directory,stage it(git add) and commit(git commit) it and then push(git push) it back to the remote repository,it gives me the following error. C:\Lmg_te