Git conflict resolution and graphical code comparison

If you do not specify a file name and do not specify a branch name, but a label, remote branch, SHA-1 value, or something like master~3, you get an anonymous branch called detached head (the detached head identity). The modified code in this state needs to be checkout into a new branch to upload to master.

If there is a conflict, you can use graphical Mergetool

Also, check the code churn for two commits, which can be compared on the command line with diff Commit1 Commit2. It's better to start a graphical comparison by entering GITK under the branch you want to compare.

https://lostechies.com/joshuaflanagan/2010/09/03/use-gitk-to-understand-git/

Git conflict resolution and graphical code comparison