subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Christopher D Haakinson <cdhaa...@us.ibm.com>
Subject Help with files changed outside of svn
Date Mon, 28 Feb 2011 15:54:46 GMT

I'm fairly new to svn, and I have things set up and running well.

I wanted to test out a scenario where a file controlled by svn gets changed
outside of svn inside the working copy, and now I'm lost and can't find
much help on what to do.

Here's my example:  I setup the hooks folder as a svn project. Checked it
out onto my windows box and made a small change, then committed the
changes.
Now I went through my command shell and manually changed a file outside of
svn.
Then I went back to my windows box and editted the same file with a
different change.
Now the original file contains:  ">>>>>>> .r3" at the bottom

Also I have some more files inside my working directory too:

 pre-revprop-change.tmpl
 pre-revprop-change.tmpl.mine
 pre-revprop-change.tmpl.r2
 pre-revprop-change.tmpl.r3


Can someone please explain to me:

1) Why does >>>>>>> get put into the bottom of my files?
2) What are the 3 copies of this file for?

3) And now how do I get these files merged back into one copy with the
changes made inside svn included and the changes made outside svn excluded?
Mime
View raw message