I hate git conflict , 1 hour to add feauture in your project and 7 hour to resolve conflicts
Hopefully, this post helps to reduce that time. I'll write a post about how to prevent merge conflicts in the future.
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
Confirm
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
I hate git conflict , 1 hour to add feauture in your project and 7 hour to resolve conflicts
Hopefully, this post helps to reduce that time. I'll write a post about how to prevent merge conflicts in the future.