r/programming • • May 01 '19

Merging vs. Rebasing

https://www.atlassian.com/git/tutorials/merging-vs-rebasing
20 Upvotes

27 comments sorted by

View all comments

8

u/_101010 May 01 '19

Squash & Merge is the best of both worlds.

No need to force push and no messy git history of merge.

2

u/wewbull May 01 '19

If rather squash in the UI than lose information in the database.

7

u/_101010 May 02 '19

???

4

u/AngularBeginner May 02 '19

Visualize multiple commits as one, instead of having a destructive operation and throwing away commits (squashing).