Default behaviour is when the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit.
Use --no-ff to resolve.
git merge <branch-name> --no-ff -m "<commit message>"
Default behaviour is when the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit.
Use --no-ff to resolve.
git merge <branch-name> --no-ff -m "<commit message>"
| status | not learned | measured difficulty | 37% [default] | last interval [days] | |||
|---|---|---|---|---|---|---|---|
| repetition number in this series | 0 | memorised on | scheduled repetition | ||||
| scheduled repetition interval | last repetition or drill |