DEV Community

Discussion on: GIT Mantras you should know

Collapse
 
andreacanton profile image
Andrea Canton

Good point! But in my experience, in most cases, I'm trying to push a single or two commits and there aren't conflicts, so the merge commit is identical to the commit(s). If the rebase is too large or full of conflicts you can simply send a git rebase --abort and do the merge instead.

Thank you for sharing!!!