Using BitBucket,I created a branch off of master, made my changes, added, committed, pushed and created a pull request. Some time later I looked at the pull request via Navigation->Pull Requests. I see I have conflicts.
How do I fix these myself. I've read all the docs, but I'm still cloudy. Do I edit directly on BitBucket?
According to this documentation, BitBucket should give you instructions to handle the conflicts.
There are resolved using the command line, though you may be able to resolve them using some UI tool.
I hope it was helpful.
Jaime Kirch da Silveira
Atlassian Cloud Support
Badges are a great way to show off community activity, whether you’re a newbie or a Champion.Learn more
After spinning my wheels trying to get organized enough to write a book for National Novel Writing Month (NaNoWriMo) I took my affinity for Atlassian products from my work life and decided to tr...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs