We’re also going make a commit message that says “Changed first to second” to see the effects in our Git History later.įor the second set of code, you can change the same README.md file on your local repository. Let’s say we change the text in README.md from “Hello world, this is my first Github repo” to “Hello world, this is my second Github repo”. In our case, we edit the files on GitHub to simulate a change. For the first set, we need someone to push code into the remote. To produce a Git conflict, we need two sets of code. You’ll learn how to resolve a Git conflict today.įirst, let’s produce a Git conflict so you see what happens. This happens because Git no idea whether your friend’s version is the updated version or your version is the updated version. When you pull their changes into your local repository, you’ll notice that there is a conflict. At the same time, you also made a change to the same line of code. Let’s say a friend of made a change to your repository and pushed the changes to the Git remote.

Note: This the sixth video in the Git for beginners series.

Git resolving conflict winmerge git