https://tube.switch.ch/videos/8a6ca2af
16 October 2020, Martin Kropp, 6074 views
This 6' video demonstrates by example how to solve a merge conflict after a Pull Request with Git and Bitbucket
Viewable by everyone. All rights reserved.