Jerry resolved the conflict but didn't tell Subversion that he had resolved the conflict.1. In the above commit, the letter C indicates that there is a conflict in the README file. Svn: Aborting commit: '/home/jerry/project_repo/trunk/README' remains in trunk]$ svn status Jerry resolved the conflict and he retries trunk]$ svn commit -m "Updated README" So, the modified README will look like trunk]$ cat README Jerry wants Tom's changes as well as his, so he just removes the lines containing the conflict markers. Next Jerry chooses the postpone(p) options, so that he can resolve the conflict.Īfter opening the README in text editor he realizes that Subversion has included both Tom's code and his code with conflict trunk]$ cat README Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved, svn/tmp/README.tmp Sat Aug 24 18:13:03 -1 +1,11 TODO: Add contents in README file */ So Jerry chooses the df option to review the trunk]$ svn up Subversion is complaining that there is a conflict with the README file, and Subversion does not know how to solve this. (mc) mine-conflict, (tc) theirs-conflict, Select: (p) postpone, (df) diff-full, (e) edit, So, Jerry has to update his working trunk]$ svn up Subversion has detected that the README file has changed since last updated. Svn: File or directory 'README' is out of date try updating Jerry's README file looks like trunk]$ cat READMEġ) array.c Implementation of array operation.Ģ) README Instructions for trunk]$ svn status Jerry also updates the README file and tries to commit his changes. Now, the repository is at revision 7 and Jerry's working copy is out of date. M trunk]$ svn commit -m "Added supported operation in README"
The modified README will look like trunk]$ cat README After a few hours, Tom updates README file and commits his changes. Jerry checks out the latest code which is at revision 6. * TODO: Add contents in README file trunk]$ svn statusĪ trunk]$ svn commit -m "Added README file. After adding this, the file repository is at revision trunk]$ cat README So he creates the README file and adds TODO list into that.
Tom decides to add a README file for their project.
0 kommentar(er)
