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.
Thank you and I agree!
Are you sure you want to hide this comment? It will become hidden in your post, but will still be visible via the comment's permalink.
Hide child comments as well
For further actions, you may consider blocking this person and/or reporting abuse