Menu
I have done a git pull and the normal merge markers are now available in the original file and visible within the Intellij project:
Is there a way to show the three panel merge conflict resolution dialog for this file?
Note: there is a command line tool to do this that works well - but I am looking actually for some way within Intellij. The command line approach is via git mergetool :
git config --global merge.tool meld # opendiff is another option here
git mergetool -y
925
To see the beginning of the merge conflict in your file, search the file for the conflict marker <<<<<<< . When you open the file in your text editor, you'll see the changes from the HEAD or base branch after the line <<<<<<< HEAD .
The status command is in frequent use when a working with Git and during a merge it will help identify conflicted files.
Right-click the file, select Git | Resolve Conflicts... in the context menu.
195
In IntelliJ 2019.3.5, right click the 'VCS' menu in the top menu, navigate to 'Git' and choose 'Resolve Conflicts...', as shown in the attached screenshot:
.
21
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
