If you're using the latest git version there's a new merge strategy (which is the default) called ort. It's premise is that it's smarter with conflicts auto-resolution, I felt no differenve though
Thanks for mentioning, will look into it!
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.
If you're using the latest git version there's a new merge strategy (which is the default) called ort.
It's premise is that it's smarter with conflicts auto-resolution, I felt no differenve though
Thanks for mentioning, will look into it!