Anyone that works with subversion will know that merging 2 branches is not always easy. Most of the time there is no issue, and you can merge one or multiple changes from one branch to another, but sometimes you end up with conflicts left right and center. This is done with the standard merge commands:
People keep telling me to get with the times, and stop using vim as my primary text editor, but today I found a nice easy way to fast-find something. All you need to do is move the cursor over the piece of text you want to find and press Shift + 8; when you are not in INSERT mode.