And how do you manage merge conflicts or choose what to merge when and how? What if there are 10 push (or is it pull?) requests and you have no idea where to start? I know of diff, but never used it aside from debugging some compiler issues (which was mostly googling) when using make on Linux..
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.
And how do you manage merge conflicts or choose what to merge when and how? What if there are 10 push (or is it pull?) requests and you have no idea where to start? I know of diff, but never used it aside from debugging some compiler issues (which was mostly googling) when using make on Linux..
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.