Git will show conflicts if there are many spaces in the same file. It can spend too much time to fix these conflicts if the spaces are too many. Use git help merge to refer to the manual page. ignore-space-change, ignore-all-space, ignore-space-at-eol, ignore-cr-at-eol Treats lines with the indicated type of Read more…
git reset <pathspec> is the opposite of git add <pathspec>. git reset [<commit>] resets the index but not the working tree (i.e., the changed files are preserved but not marked for commit) and reports what has not been updated. The command git reset <pathspec> will change the index information but Read more…
git merge – master – dev – master merge dev git merge another branch.xmind
We want to compare the current branch and another branch to find the changes since they diverged. For example, we create a new branch dev from branch master and add a few commits, the branch master also update after diverging. The common ancestor is in the following part. The following Read more…