Git: Ignore whitespace when merging or cherry-picking

You can tell git to ignore different kinds and amounts of whitespace when merging or cherry-picking. This often occurs when you changed indentation, or converted tabs to spaces.

Simply use

Copygit merge <REV> -Xignore-space-change

or

Copygit cherry-pick <REV> -Xignore-space-change