# Resolve Git conflicts

When you work in a team, you may come across a situation when somebody pushes changes to a file you are currently working on. If these changes do not overlap (that is, changes were made to different lines of code), the conflicting files are merged automatically. However, if the same lines were affected, Git cannot randomly pick one side over the other, and asks you to resolve the conflict.

In Git, conflicts may arise when you attempt to perform one of the following operations: [pull](sync-with-a-remote-repository.html#pull), [merge](apply-changes-from-one-branch-to-another.html#merge), [rebase](apply-changes-from-one-branch-to-another.html#rebase-branch), [cherry-pick](apply-changes-from-one-branch-to-another.html#cherry-pick), [unstash changes](shelving-and-unshelving-changes.html#unstash) or [apply a patch](using-patches.html#apply-patch). If there are conflicts, these operations will fail, and you will be prompted to accept the upstream version, prefer your version, or merge the changes:

![Files Merged with Conflicts dialog](https://resources.jetbrains.com/help/img/idea/2026.2/merge_conflicts_dialog.png)

The Conflicts dialog is triggered automatically when a conflict is detected on the Git level.

For each file with conflicting changes, there are three options to resolve conflicts:

* Accept Yours: keep the changes from the currently checked-out branch and discard the changes from the branch you are merging.

* Accept Theirs: accept the changes from the branch you are merging and discard the changes from the currently checked-out branch.

* [Resolve each conflict manually](#vcs-resolve-conflicts): review each conflict and choose which changes to keep.

> **Tip:**
> If you close the Conflicts dialog or run a Git operation from the command line that results in merge conflicts, a Merge Conflicts node appears in the Changes view of the Commit tool window with a link to resolve them.
>
>
>
> You can also continue resolving conflicts by clicking ![](https://resources.jetbrains.com/help/img/idea/2026.2/intellij.platform.vcs.dvcs.impl.shared.icons.new.resolveContinue.svg) Resolve Conflicts or stop the merge process by clicking ![](https://resources.jetbrains.com/help/img/idea/2026.2/app.expui.vcs.abort.svg) Abort Merge in the upper toolbar.
>
>
>
> ![The Merge Conflicts node in the Local Changes view](https://resources.jetbrains.com/help/img/idea/2026.2/git_merge_conflicts_node.png)

When you double-click a file with conflicting changes, IntelliJ IDEA opens a tool for resolving conflicts locally. This tool consists of three panes:

* The left pane shows the read-only local copy

* The right pane shows the read-only version checked in to the repository.

* The central pane is a fully-functional editor where the results of resolving conflicts are displayed. Initially, the contents of this pane are the same as the base revision of the file, that is, the revision from which both conflicting versions are derived.

![color coding in the conflict resolution tool](https://resources.jetbrains.com/help/img/idea/2026.2/conflict_resolution_tool_legend.png)

1. Modified line

2. Deleted lines

3. Newly added lines

4. Conflicting lines

Procedure: Resolve conflicts

Before resolving conflicts for each file manually, you can automatically merge non-conflicting changes in all files by clicking Resolve All Simple Conflicts in the Conflicts dialog.

1. To start merging conflicting changes, select one of the files with conflicts in the Conflicts dialog and click Resolve Manually .

2. To automatically merge all non-conflicting changes, click ![the Apply Non-Conflicting Changes button](https://resources.jetbrains.com/help/img/idea/2026.2/app.diff.applyNotConflicts.svg) (Apply All Non-Conflicting Changes) on the toolbar. You can also use the ![the Apply Non-Conflicting Changes from the Left button](https://resources.jetbrains.com/help/img/idea/2026.2/app.diff.applyNotConflictsLeft.svg) (Apply Non-Conflicting Changes from the Left Side) and ![the Apply Non-Conflicting Changes from the Right button](https://resources.jetbrains.com/help/img/idea/2026.2/app.diff.applyNotConflictsRight.svg) (Apply Non-Conflicting Changes from the Right Side) to merge non-conflicting changes from the left/right parts of the dialog, respectively.

3. To resolve a conflict, you need to select which action to apply (accept ![the Accept button](https://resources.jetbrains.com/help/img/idea/2026.2/app.diff.arrow.svg) or ignore ![the Ignore button](https://resources.jetbrains.com/help/img/idea/2026.2/app.diff.remove.svg)) to the left (local) and the right (repository) versions and check the resulting code in the central pane:

![Resolve conflicts](https://resources.jetbrains.com/help/img/idea/2026.2/resolveConflict.png)

You can also right-click a highlighted conflict in the central pane and use the commands from the context menu. The Resolve using Left and Resolve using Right commands provide a shortcut to accepting changes from one side and ignoring them from the other side, respectively:

![the context menu of a conflicting change](https://resources.jetbrains.com/help/img/idea/2026.2/resolve_using_left_right.png)

For simple conflicts (for example, if the beginning and the end of the same line have been modified in different file revisions), the Resolve simple conflicts ![the Resolve simple conflicts button](https://resources.jetbrains.com/help/img/idea/2026.2/app.diff.magicResolve.svg) button that allows merging the changes in one click becomes available.

![the Resolve Simple Conflicts button](https://resources.jetbrains.com/help/img/idea/2026.2/simple_conflict_resolve.png)

Such conflicts are not resolved with the Apply All Non-Conflicting Changes action since you must make sure that they are resolved properly.

> **Note:**
> Note that the central pane is a fully-functional editor, so you can make changes to the resulting code directly in this dialog.

4. It may also be useful to compare different versions to resolve a conflict. Use the ![the Compare contents button](https://resources.jetbrains.com/help/img/idea/2026.2/app-client.expui.vcs.diff.svg) toolbar button to invoke the list of options.  Note that Base refers to the file version that the local and the repository versions originated from (initially displayed in the middle pane), while Middle refers to the resulting version.

5. Review merge results in the central pane and click Apply Changes. The current file will close, and the next file with conflicts will open.

If you click Save and Close, the current file will close, and you will be returned to the list of remaining conflicts:

![The list of unresolved and resolved conflicts in the Conflicts dialog](https://resources.jetbrains.com/help/img/idea/2026.2/merge_conflicts_dialog_progress.png)

If you need to revert the merge result, right-click the file in the Conflicts dialog and select Revert conflict resolution. The file will return to its conflicted state.

6. If there are no remaining conflicts, the Conflicts dialog enables the Accept and Finish option. Click it to complete the merge.

## Productivity tips

Apply non-conflicting changes automatically
: You can configure IntelliJ IDEA to always apply non-conflicting changes automatically instead of telling it to do so from the Merge dialog. To do this, select the Automatically apply non-conflicting changes option on  the Tools | Diff Merge settings page `Ctrl+Alt+S` (Windows), `⌘ Comma` (macOS), `⌘ Comma` (IntelliJ IDEA Classic (macOS)), `⌘ Comma` (macOS System Shortcuts), `Ctrl+Alt+S` (XWin), `Ctrl+Alt+S` (GNOME), `Ctrl+Alt+S` (KDE), `Ctrl+Alt+S` (Emacs), `Ctrl+Alt+S` (Sublime Text), `⌘ Comma` (Sublime Text (macOS)), `Ctrl+Alt+S` (NetBeans), `Ctrl+Alt+S` (Visual Studio), `⌘ Comma` (Visual Studio (macOS)), `Ctrl+Alt+S` (Eclipse), `⌘ Comma` (Eclipse (macOS)) .

Manage changes in the central pane
: You can manage changes in the central pane using the toolbar that appears when you hover over a change marker in the gutter and then click it. The toolbar is displayed together with a frame showing the previous contents of the modified line:
:
:
:
: ![the change toolbar](https://resources.jetbrains.com/help/img/idea/2026.2/conflicts_change_toolbar.png)
:
: For example, when there are multiple non-conflicting changes, and you only need to skip one or two of them, it's easier to apply all of them simultaneously using the Apply all non-conflicting changes action and then undo the unwanted ones using the Revert action from this toolbar.

## Handle conflicts related to LF and CRLF line endings

Quite often, people working in a team and contributing to the same repository use different operating systems. This may result in problems with line ending, because Unix, Linux and macOS use `LF`, and Windows uses `CRLF` to mark the end of a line.

IntelliJ IDEA displays the discrepancies in line endings in the Diff Viewer, so you can fix them manually. If you want Git to solve such conflicts automatically, you need to set the `core.autocrlf` attribute to `true` on Windows and to `input` on Linux and macOS (for more details, refer to [Dealing with line endings](https://help.github.com/articles/dealing-with-line-endings/)). You can change the configuration manually by running `git config --global core.autocrlf true` on Windows or `git config --global core.autocrlf input` on Linux and macOS.

However, IntelliJ IDEA can automatically analyze your configuration, warn you if you are about to commit `CRLF` into a remote repository, and suggest setting the `core.autocrlf` setting to `true` or `input` depending on your operating system.

To enable smart handling of `LF` and `CRLF` line separators, open the Settings dialog `Ctrl+Alt+S` (Windows), `⌘ Comma` (macOS), `⌘ Comma` (IntelliJ IDEA Classic (macOS)), `⌘ Comma` (macOS System Shortcuts), `Ctrl+Alt+S` (XWin), `Ctrl+Alt+S` (GNOME), `Ctrl+Alt+S` (KDE), `Ctrl+Alt+S` (Emacs), `Ctrl+Alt+S` (Sublime Text), `⌘ Comma` (Sublime Text (macOS)), `Ctrl+Alt+S` (NetBeans), `Ctrl+Alt+S` (Visual Studio), `⌘ Comma` (Visual Studio (macOS)), `Ctrl+Alt+S` (Eclipse), `⌘ Comma` (Eclipse (macOS)), and select the Version Control | Git node on the left. Enable the Warn if CRLF line separators are about to be committed option.

After you have enabled this option, IntelliJ IDEA will display the Line Separators Warning Dialog each time you are about to commit a file with `CRLF` separators, unless you have set any related [Git attributes](https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html) in the affected file (in this case, IntelliJ IDEA supposes that you clearly understand what you are doing and excludes this file from analysis).

In the Line Separators Warning Dialog, click one of the following:

* Commit As Is to ignore the warning and commit a file with `CRLF` separators.

* Fix and Commit to have the `core.autocrlf` attribute set to `true` or `input` depending on your operating system. As a result, `CRLF` line separators will be replaced with `LF` before the commit.

If, at a later time, you need to review how exactly conflicts were resolved during a merge, you can locate the required merge commit in the  Log tab of the   Git tool window  `Alt+9` (Windows), `⌘ 9` (macOS), `⌘ 9` (IntelliJ IDEA Classic (macOS)), `⌘ 9` (macOS System Shortcuts), `Alt+9` (XWin), `Alt+9` (GNOME), `Alt+9` (KDE), `Alt+9` (Emacs), `Alt+9` (Sublime Text), `⌘ 9` (Sublime Text (macOS)), `Alt+9` (NetBeans), `Alt+9` (Visual Studio), `⌘ 9` (Visual Studio (macOS)), `Alt+9` (Eclipse), `⌘ 9` (Eclipse (macOS))  , select a file with conflicts in the Commit Details pane in the right, and click ![the Show diff icon](https://resources.jetbrains.com/help/img/idea/2026.2/app-client.expui.vcs.diff.svg) or press `Ctrl+D` (Windows), `⌘ D` (macOS), `⌘ D` (IntelliJ IDEA Classic (macOS)), `⌘ D` (macOS System Shortcuts), `Ctrl+D` (XWin), `Ctrl+D` (GNOME), `Ctrl+D` (KDE), `Ctrl+D` (Emacs), `Ctrl+D` (Sublime Text), `⌘ D` (Sublime Text (macOS)), `Ctrl+D` (NetBeans), `Ctrl+D` (Visual Studio), `⌘ D` (Visual Studio (macOS)), `Ctrl+D` (Eclipse), `⌘ D` (Eclipse (macOS)). For more information, refer to [Review how changes were merged](investigate-changes.html#review_merge_commit).

Watch this video to learn more on how to resolve merge conflicts:

[Video](https://www.youtube.com/v/WgipWkaU2MM)

## See also

### Reference

[Changelists](settings-version-control-changelist-conflicts.html) [Version Control window](version-control-tool-window.html)