With a merge conflict you must understand the purpose of both changes and identify how to achieve them both. For me this a lot of times means tracking down the commits from both changes to get the context.
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.
With a merge conflict you must understand the purpose of both changes and identify how to achieve them both. For me this a lot of times means tracking down the commits from both changes to get the context.