At this point, we want to look at the Changes in the local repository so that we can commit those changes.įrom the Changes page in Team Explorer, perform a "Commit All and Sync" action. The Home page of the Team Explorer shows the various actions you can take in your project's repository. View the Team Explorer panel in Visual Studio. We are creating the conflict in the remote repository by adding a "by-line" with slightly different text, as demonstrated below. Next, use your browser to edit the README.md file directly in GitHub. Save the changes, but don't perform any commits on your local machine. Open the README.md file in Notepad on your computer and edit the document by adding a "by-line", as demonstrated below. We won't be using the application itself the purpose is just to be able to use Visual Studio's Team Explorer later on. Initialize the repository with a README.md fileĪt this point, you can clone the repository to your computer by choosing "Open in Desktop".īecause we will be using Visual Studio's Team Explorer in resolving merge conflicts in the next section, create a simple console application inside your code repository.# Setting Up The Repositoryīegin by creating a new repository on GitHub from your browser. The lab computers are already set up with Visual Studio, but you will probably need to install the remaining programs on your own before proceeding. This walkthrough on resolving merge conflicts assumes that you have the following installed on your computer. In this walkthrough, we will manually create and resolve a merge conflict. This is a first-draft article on resolving merge conflicts.
0 Comments
Leave a Reply. |