How to resolve bitbucket merge conflicts to master from a release branch?
JJ The Engineer
2:40 PM
This happens a fair amount on bitbucket, and I needed a reminder on how to resolve the conflicts without merging the branch into my feature ...
How to resolve bitbucket merge conflicts to master from a release branch?
Reviewed by JJ The Engineer
on
2:40 PM
Rating: