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?
Use git mergetool? Anyway, this question is probably better asked in a Git forum. Best, -- Marnen Laibow-Koser http://www.marnen.org [email protected] -- 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 -~----------~----~----~----~------~----~------~--~---
