hpi-swa / Squot

Squeak Object Tracker - Version control for arbitrary objects, currently with Git storage
Other
61 stars 29 forks source link

Merge --no-ff #299

Open j4yk opened 3 years ago

j4yk commented 3 years ago

Since Squot learned to fast-forward, it always uses fast-forward if possible. Some workflows would like to create merge commits even if a fast-forward would be possible.

As a Git-workflow-aficionado I want to be able to force merge commits, so that I can keep track of the feature branches I merged into my integration branches.