2009/8/19 Milan Dobrota <[email protected]>: > > 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? > --
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. Colin --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
