Colin Law wrote:
> Just checkout your version from your local repository again. If the
> pull failed due to conflicts then so will a push, in fact I believe it
> is always best to pull, sort the conflicts, commit then push.
>From man git-merge:
HOW TO RESOLVE CONFLICTS
After seeing a conflict, you can do two things:
o Decide not to merge. The only clean-ups you need are to reset
the index file to the HEAD
commit to reverse 2. and to clean up working tree changes
made by 2. and 3.; git-reset
--hard can be used for this.
git pull is basically git fetch + git merge. If conflicts occur this
should happen in the git merge phase. From that point you can choose to
resolve the conflicts and commit or, as stated above, choose not to
merge. Using git reset --hard can be used for the later as I stated in
an earlier post.
--
Posted via http://www.ruby-forum.com/.
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups "Ruby
on Rails: Talk" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/rubyonrails-talk?hl=en
-~----------~----~----~----~------~----~------~--~---
