Maybe you need to use rebase to get the commits with previous changes(pull requests) from your repo on github, but maybe this isn't the problem.
If you have conflicts you need to resolve them manually or say to git that resolves throught a merge strategy.
If you trust your changes and you want to set all of them in the repo(positioned in your repo/branch):
git merge -X ours otherbranch
If you dont trust your changes and you want to avoid all of them in the repo(positioned in your repo/branch):
git merge -X theirs otherbranch
But if you want to do this manually, git mergetool can be helpful
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.
Maybe you need to use rebase to get the commits with previous changes(pull requests) from your repo on github, but maybe this isn't the problem.
If you have conflicts you need to resolve them manually or say to git that resolves throught a merge strategy.
If you trust your changes and you want to set all of them in the repo(positioned in your repo/branch):
If you dont trust your changes and you want to avoid all of them in the repo(positioned in your repo/branch):
But if you want to do this manually, git mergetool can be helpful