![]() ![]() Some of them it can figure out and handle automatically. Git tries to reconcile Grant’s changes with the changes I just made. That partially worked, but it’s telling me there was a conflict. In order for Git to let me push my changes, I first need to pull down his changes so that my code is in sync with what’s out on GitHub. He added CSS classes to index.html and some rules to styles.css. In fact, my coworker Grant has pushed some styling changes. Apparently another developer has made changes to the master branch since I last pulled. I am making some changes to the text on index.html. Here are the two files at the beginning of the day. Our repository is hosted at GitHub, and in this case we are both working directly on the master branch. We’re starting out with two files, index.html and styles.css. To set the scene, Grant and I are two developers working on a simple web page. ![]() This post provides a walkthrough of how to get through two typical Git conflict scenarios. This happens when multiple developers are making changes in a repository at the same time. ![]() One of the most challenging yet common activities development teams run into with Git is resolving merge conflicts. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |