Changes between Version 36 and Version 37 of Release


Ignore:
Timestamp:
08/09/11 11:52:37 (3 years ago)
Author:
waxhead
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • Release

    v36 v37  
    157157if you do, then the following is a quick crib on how to deal with it. 
    158158 
     159Note: you will likely get a conflict with messages.pot, you can "skip" this conflict by selecting "tf", "Theirs Full" 
     160option. 
     161 
    159162When svn updating you SVN will halt at the file in conflict asking you what to do, simply select "postpone" as  
    160163we will go back to the conflicted file(s) after the merge has completed.