Basically you want to only merge into mainline, rebase your working branch to get the latest from mainline.
Note this advice holds true if you have multiple mainlines. Merge across mainlines.
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.
Basically you want to only merge into mainline, rebase your working branch to get the latest from mainline.
Note this advice holds true if you have multiple mainlines. Merge across mainlines.