Manually merging git commits

Mon, 01 Jan 0001 00:00:00 +0000

Today I learned how to manually merge a git branch, when you want to be sure to compare each difference after a merge.

Don’t fast-forward and commit when merging:

git merge --no-ff --no-commit feature-branch

Now changes are applied and staged. Because we want to inspect each difference, we remove all changes from the staging area:
```
git restore --staged .
```
Changes are now only applied, but not staged. So we can now easily inspect each change (via cli or IDE) and remove all changes we don’t want to keep.
```
git add --patch -- . # to add changes to the staging area
git checkout --patch -- . # to fully remove applied changes
```

Cli on Datengraben