Conflicts are caused when two branches both have changes to the same file that could potentially overwrite each other. Source control keeps track of these kinds of changes and will alert the developer to these issues. Resolving conflicts is an important part of being able to use source control. Conflicts are discovered when trying to merge one branch into another. In the last part of this series we are going to look at how to manage conflicts with SourceTree.
In part 1 we looked at installing our source control tools and setting up our first repository. To truly make source control as powerful as it can be we need to create new branches for various changes that we make so that we can switch back and forth between different versions of our site. In part two below we are going to look at how to do just that.
Source Control is a concept that I had overlooked for several years. As the sole developer for several companies over the years I did not see the need for source control mainly because I did not understand source control. Source control ultimately is a way to protect you from your own mistakes and the mistakes of others. By using source control you can have a way to easily go back to previous versions of your code if you made some changes to an area by mistake or if the client decided that they did not like the new changes and wanted the old ones back. All of these situations have happened to me. Had I been using source control these would not have been the major issue that they turned into.
BitBucket is a website that is run by Atlassian and offer free private repositories. These repositories can be easily accessed and controlled with Atlassians GUI git client called Source Tree. The following describes how to install git, source tree and create a BitBucket account as well as how to set up your first branch and create a Visual Studio project to work with source control. Continue reading