Tag Archives: subversion
Posted in: Programming by Steve on October 28, 2010
I run across this error way too much. I try to merge a branch into my working copy or another branch, and I get tree conflicts that I can’t explain. It’s probably because I’m a VCS dummy or because I was doing it wrong at one point or another.
I found this blog post that described how to do branching & merging and it describes a step to resolve the tree conflicts.
svn resolve -R --accept working *
So now, It’s easy enough to just execute this command and move on.
Posted in: Programming by Steve on September 21, 2010
So I’ve been working on a feature where I needed to strip out a lot of legacy code. Unfortunately, as I was doing so, I was touching more of the code than I really wanted to. The code in question was not under test and would have to be manually retested.
I had created a branch from the main development branch and had made several commits since the changes had started. I needed to revert back to when I started tearing some of the original code out.
In Subversion, you have to merge the revision you want to go back to into your current revision and commit.
This is the command:
svn merge -r2467:2453
In my case, the revision I was on was 2467 (current revision) and I wanted to revert back to revision 2453 (revert to revision).
I haven’t had to do this before, and had to look it up.