How to resolve Subversion Conflicts - Ariejan.net - The Diigo Meta page

• 11 Aug 13
  

  Andreas Triantafyllidis

  HINTS_TIPS

• 18 Apr 13
  

  galapea

  "svn revert"

  svn-conflicts-resolve

• 07 Nov 12
  

  Micah Taylor

  svn conflict

• 15 Oct 12
  

  Esfand S

  svn resolve conflict

• 22 Jun 12
  

  gallypette

  subversion gforge svn conflict

  • $ svn revert README Reverted 'README' $ svn update README At revision 6.
  • I recommend you don't just commit to your repository, but follow a slightly different route.

  • First, update your working copy (again) to make sure you have all the latest, and are not trying to check in any more conflicting code. If any conflicts pop-up, fix these first.

      

    Now, run your tests to make sure everything is working as it should.

      

    When all is clear, commit your changes to your repository as you normally would.

      

    Done. Problem solved.

  1 more annotation...

• 26 Jun 11
  

  mrengy

  bxdwebsite webdevelopment subversion

• 31 Dec 10
  

  ktzonas

  svn programming tutorial

• 16 Apr 09
  

  Steve Bumgarner

  subversion

Would you like to comment?

Join Diigo for a free account, or sign in if you are already a member.