Milan Dobrota wrote: > You pull. You have conflicts. You want to go back to how it was before > pulling and push your version. How do you do that without editing the > file line by line?
If conflicts occur during a pull the auto-merge should fail leaving the changes in your working tree. At this point you should be able to run: git reset --hard to return your working tree to the tip of the current branch. P.S. I agree this question would be more appropriate for a git forum. -- 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 rubyonrails-talk@googlegroups.com To unsubscribe from this group, send email to rubyonrails-talk+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/rubyonrails-talk?hl=en -~----------~----~----~----~------~----~------~--~---
