Changes between Version 38 and Version 39 of Release


Ignore:
Timestamp:
08/19/11 13:55:29 (3 years ago)
Author:
waxhead
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • Release

    v38 v39  
    159159When dealing with merge conflicts consider "where you are".  If you switched from the branch to trunk, the notion of "theirs-full" is going to be the branch that you are merging in.  If you are merging trunk back to the branch, then trunk will be "theirs" and the branch will be "mine". 
    160160 
     161When you make a mistake with the merge, you can undo the merge with {{{ svn merge -c -15702 . }}} where the revision number here is the revision number of the commit to trunk you just made after merging. 
     162 
     163Once you have done that, commit the change to trunk, start the merge from the branch again, keeping in mind "where you are". 
     164 
    161165Note: you will likely get a conflict with messages.pot, you can "skip" this conflict by selecting "tf", "Theirs Full" 
    162166option if you are merging trunk to the branch, or "mf", "Mine Full" if the merge is the branch to trunk.