How to Resolve Git Conflicts Faster and More Easily in Your Favorite IDE

Resolve git conflicts in VS Code, IntelliJ, Nano, and Sourcetree

Photo by Richard Lee on Unsplash.

Conflicts Happen

You changed a file, and so did your coworker. Conflicts will happen and will probably end up on your table.

You lag behind a fast-track branch (e.g. develop), you end up with conflicts. Resolving the issues can take up to a day, so finding a way to get it done quickly is really important.

In this article, I’ve compiled five fast methods to resolve git conflicts.

1. VS Code

Resolving git conflicts in VS Code

VS Code is by far my favorite conflict solver. You will get a cute interface right above the conflicts. There are three options for resolving conflicts:

1. Accept current change.
2. Accept incoming change.
3. Accept both changes.

These options are self-explanatory. Clicking the options will apply the action they describe. Conflicts can be inline. For those, you can just edit the file in VS Code.️️️