Download Fossil Version Control A Users Guide

Fossil Version Control
A Users Guide
Figure 48: Repository Fork
Not good, there are two Leaf’s and Marilyn would commit code to her fork and Jim would be
commiting code to his. So Jim must fix this by merging the code. Jim wants to merge versions
[b72e96832e] of Marilyn and his [1beab85441].
4.2.3
Fixing the fork
So Jim who’s checked out code is from Leaf [1beab85441] does a merge with Marilyn’s leaf
[b72e96832e] like so:
PAN-20100424
Revision: 1.79
28 December 2014
Page 42 of 85