I'm fixing merge conflicts for other contributors at the command line. Still learning how Git works here, so bear with me...
Like so...
git checkout -b otherusersbranch master
git pull https://github.com/otheruser/myrepo.git otherusersbranch
....find and fix conflicts
git add .
git commit -m "fixing merge conflicts"
git push origin otherusersbranch
git checkout master
git merge --no-ff otherusersbranch
git push origin master
When the merge conflict appears corrected from the command line, I'm pushing the change to the contributor's branch like normal. However, the merge conflict indicator in the pull request has remained unchanged and I can't see my commits in the pull request. What am I doing wrong?
Pull the most recent version of the repository from Bitbucket. Checkout the source branch. Pull the destination branch into the source branch. At this point, pulling the destination will try to merge it with the source and reveal all the conflicts.
Pull requests are closed automatically whenever the maintainer merge the changes through the web interface. If he merged using the command line, it will be closed as soon as he pushes the code back to Github. So if a PR is still open, it means it is not merged.
I don't think you are successfully pushing the changes to the user's branch. Try submitting a pull request to that branch. Otherwise, you need to give yourself permission to push directly.
From what you've described, you're only pushing changes to your own branch, which is why it's not showing up in the commit history.
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With