How to resolve merge conflicts then ?
merge conflicts
With a good Prenuptial agreement
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.
How to resolve
merge conflictsthen ?With a good Prenuptial agreement