Changes between Version 37 and Version 38 of Release


Ignore:
Timestamp:
Aug 19, 2011, 1:17:28 PM (3 years ago)
Author:
waxhead
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • Release

    v37 v38  
    157157if you do, then the following is a quick crib on how to deal with it. 
    158158 
     159When 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". 
     160 
    159161Note: you will likely get a conflict with messages.pot, you can "skip" this conflict by selecting "tf", "Theirs Full" 
    160 option. 
     162option if you are merging trunk to the branch, or "mf", "Mine Full" if the merge is the branch to trunk. 
    161163 
    162164When svn updating you SVN will halt at the file in conflict asking you what to do, simply select "postpone" as