/[lwip]/lwip/doc/savannah.txt
ViewVC logotype

Diff of /lwip/doc/savannah.txt

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.1.2.4 by likewise, Thu Sep 25 22:42:23 2003 UTC revision 1.1.2.5 by likewise, Fri Nov 14 13:00:08 2003 UTC
# Line 31  cvs -d:pserver:anoncvs@subversions.gnu.o Line 31  cvs -d:pserver:anoncvs@subversions.gnu.o
31  ---------------------------------------------------------  ---------------------------------------------------------
32    
33  Merging is a delicate process in CVS and requires the  Merging is a delicate process in CVS and requires the
34  following disciplined manual in order to prevent future conflicts.  following disciplined steps in order to prevent conflicts
35    in the future. Conflicts can be hard to solve!
36    
37  Merging from branch A to branch B requires that the A branch  Merging from branch A to branch B requires that the A branch
38  has a tag indicating the previous merger. This tag is called  has a tag indicating the previous merger. This tag is called
39  'merged_from_A_to_B'. After merging the tag is overwritten in  'merged_from_A_to_B'. After merging, the tag is moved in the
40  the A branch to remember this merger for future merge actions.  A branch to remember this merger for future merge actions.
41    
42  IMPORTANT: AFTER COMMITTING A SUCCESFUL MERGE IN THE  IMPORTANT: AFTER COMMITTING A SUCCESFUL MERGE IN THE
43  REPOSITORY, THE TAG MUST BE SET ON THE SOURCE BRANCH OF THE  REPOSITORY, THE TAG MUST BE SET ON THE SOURCE BRANCH OF THE

Legend:
Removed from v.1.1.2.4  
changed lines
  Added in v.1.1.2.5

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26