Branch Commands • git branch List all the branches in a repository. • git branch Create a new branch with the specified name. • git checkout Switch to a different branch. • git merge Merge the current ...
easy-conflict is a terminal native Git mergetool with a 3 pane IntelliJ like resolver. It focuses on conflict blocks and writes the resolved result back to the merged file.
Some results have been hidden because they may be inaccessible to you
Show inaccessible results