...
Just like merging or rebasing, you may have to handle a merge. If so, run git mergetool and then git cherry-pick --continue
When cherry-picking, it can be useful to ignore newline differences. This can be done with:
| Code Block |
|---|
git cherry-pick --strategy=recursive -X ignore-space-at-eol 3d4fcf9e
|
Other merge strategies supported by git-merge should work as well
Resetting
The reset command does a lot of diferent things. The most basic form is as follows. It will replace the file in your working directory with the last committed version in the repository HEAD.
...