Comments: (3)
| I started working with SVN about a week ago and I'm a little confused by the dance, maybe I've just got 2 left feet!
This looks like a fairly manual process but I thought there was a merge feature that would automatically pick up any changes made by another developer and prompt for how to deal with the merge? |
| @Simon
Yes, it is a manual process. There are merge applications (WinMerge, BeyondCompare) that help you merge the changes in but you don't want those applications launching automatically. The tool will make your merges easier but you must always manage them manually.
It's not as tedious as it sounds. If you check in often, that is. If you are checking in a few times a day, the merges are almost non-existent and where they do exist, they are pretty easy to "almost" automate completely using a merge tool. I'll try to talk about it in a cast on Continuous Integration |
| @Kyle, Thanks for getting back to me ;) I've just finished reading "Review of the Check-In Dance" on CodeBetter and the process is a lot clearer in my head, soon I'll be Fred Astaire!
Looking forwards to the next cast they're brilliant! |
|
