Hello All, I am trying to do something really simple. I want to commit local changes to a remote repository. But along the way other developers modified the remote. This appears to be very difficult to do in Git.
When I finished my changes I did a commit -a. All good. But then the push failed. git fetch ok. So I tried to checkout the origin/master. That gave me a "detached head", even though it looked like I was on head. It said create a branch so I created abtmp (I do not actually want any branches). Then merged origin/master back into abtmp (which seems the wrong way). So now I have the following. What I want is to get rid of abtmp and commit back to origin/master on the remote server. $ git log --oneline --decorate --graph --all * 5e0fcfb (HEAD, abtmp) Merge remote branch 'origin/master' into abtmp |\ | * 944773a (origin/master, origin/HEAD) - shrm has to be optional logically (if s | * 4952f9c - correct to point by default * | 75b9d6d (master) Performace tests |/ * c1106db - replace with st * b046367 - set back further * 5a3ce83 - fixup doc link reference * 2ca8ecf (tag: 7.0e) - this Questions:- 1. How do I fix this up. 2. What is the best way to deal with these simple conflicts in future. Is there any doc that goes over this clearly. (e.g. not http://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes which goes over setting up multiple remotes etc. and other cleverness but not the basics.) What is wanted is "How to use Git like Svn". Thanks, Anthony -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
