Discussion on: How to Prevent Merge Conflicts (or at least have less of them)

Great article about git merge conflicts and how to avoid them. Yes, rebasing is an amazing command which I learned about myself in my first project at my first job. The better you get in git, the better you will handle conflicts.