Please enable JavaScript.
Coggle requires JavaScript to display documents.
Git Merges - Coggle Diagram
Git Merges
Fast-Forward Merge
what is it
tree is merged into 1
no additional commit message
head jumps to the latest merged branch
why use it
no
merge commit
message
simply points to the future
linear history
why not to use it
can't do small commits
Squash
what is it
all your commits squashed to 1 commit
the
branch
squashed into 1 commit
to the destination
why use it
damn clean workflow
linear workflow
good for remote master branch
why not use it
only 1 commit
other contributors not seen
only the merger
impossible to go back to specific feature
Rebase
what is it
you place a branch, on top of other branch
why use it
clean workflow
git pull rebase
why not use it
dangerous!
No Fast-Forward Merge
what is it
tree is kept like a real tree
commit message is created
parallel, not linear
why use it
comprehensive history
easy to come back to old features
many commits
why not to use it
bad on master branch
too multilinear history
Ideal Merging Workflow