[git-users] Git push error

2010-10-27 Thread Prashant Shirbhate
Hello While pusing my filed to my your public repository i got below error. Please suggest for the same C:\private\prashantgit push To c:\lmg_test\public_prashant.git ! [rejected]master - master (non-fast-forward) error: failed to push some refs to 'c:\lmg_test\public_prashant.git' To

[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 push error

2010-10-27 Thread Konstantin Khomoutov
On Oct 27, 11:22 am, Prashant Shirbhate prashantshirbh...@gmail.com wrote: While pusing my filed to  my your public repository i got below error. Please suggest for the same C:\private\prashantgit push To c:\lmg_test\public_prashant.git  ! [rejected]        master - master

[git-users] svn repository URL and git

2010-10-27 Thread hetchkay
Hi, We have started using git and git-svn. I was thrilled to see that two people cloning using git svn clone from the same repository got the same sha1 IDs for the commits which meant that each of us could sync with svn independently while still being able to share code among ourselves. But my

[git-users] Re: svn repository URL and git

2010-10-27 Thread Konstantin Khomoutov
On Oct 27, 5:06 pm, hetchkay hetch...@gmail.com wrote: We have started using git and git-svn. I was thrilled to see that two people cloning using git svn clone from the same repository got the same sha1 IDs for the commits which meant that each of us could sync with svn independently while