Changes

Jump to: navigation, search

SVN

9 bytes removed, 21:03, 22 October 2006
→‎svn resolved
*You need to do one of three things:
**Merge the conflicted text “by hand” (by examining and editing the conflict markers within the file). **Copy one of the temporary files on top of your working file. **Run <b>svn revert <filename></b> to throw away all of your local changes.
*Once you've resolved the conflict, you need to let Subversion know by running <b>svn resolved</b>. This removes the three temporary files and the file is no longer in a state of conflict:
Elichak
1
edit
Retrieved from "https://wiki.cdot.senecapolytechnic.ca/wiki/Special:MobileDiff/5581"

Navigation menu