@hz

Here's a merge git flow compared to a rebase git flow. I prefer a rebase workflow. Fast-forward merges are acceptable in a rebase workflow. The key is to avoid three-way merge commits to achieve a linear git history.

0 reply

1 recast

3 reactions