Changeset 198 in tailor for README


Ignore:
Timestamp:
12/30/04 20:37:39 (8 years ago)
Author:
lele@…
Hash name:
20041230193739-97f81-b2cd1d5638eaeeeb4f00264d4f6ed27103bd0c5d
Message:

Expanded a little the note on conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • README

    r196 r198  
    6969  $ tailor.py ~/svnwc/MyProduct 
    7070 
    71 Resolving Conflicts 
     71 
     72Resolving conflicts 
    7273=================== 
    7374 
    74 If any conflicts are found, tailor.py will flag them and prompt the user to 
    75 correct them. 
     75Should one of the replayed changes generate any conflict, tailor.py 
     76will prompt the user to correct them. This is done after the upstream 
     77patch has been applied and before the final commit on the target 
     78system, so that manually tweaking the conflict can produce a clean 
     79patch. 
    7680 
    7781 
Note: See TracChangeset for help on using the changeset viewer.