re: How to Use Git Merge [the Correct Way] VIEW POST

VIEW PARENT COMMENT VIEW FULL DISCUSSION
 

I always prefer rebasing the feature branch first, then merging. It allows for a simpler linear repo history (this is if I'm the only one working on it).

I also like to clean it up with some commit squashing with: git rebase -i HEAD~n.

code of conduct - report abuse