I know that you won’t read this, you just want the answer into how to fix a merge conflict, so here we go:
Here are the steps
- Download Visual Studio Code
- Open the project in vscode
- Navigate to the source control option on the left side of the editor
- Click on the file that you want to merge and you’ll see the visual conflict resolution tool
- The “Current Change” is the code that you have locally and the “Incoming Change” is the code that is on the git server(GitHub for example).
- You can select the options to keep the current changes, keep the incoming changes or accept both and then make any necessary adjustments
Once you are done fixing the actual conflict you are ready to push your code to the git server(a.k.a remote).
And that’s it! Let me know if this helped you out by commenting down below or sending me a DM on Instagram @easysoftwaredeveloper.
I have also created a video that shows the process demonstrated in this article.
In the video I start by creating the conflict and then solving it, which can be quite useful to see how things go “wrong” and how are conflicts generated in git.