Ignore Space When Use Git Merge Code

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 Diff Different Branches

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…

File Charset Converter
: help you to convert character encoding of file.

A prohibited operation