I'm trying to understand the process of integrating changes from my Bitbucket-based repository into a repository on my laptop. I did a push from a desktop system to my origin repository on Bitbucket and that went well. Now when I do a pull on the laptop from the origin repository on Bitbucket, I have two conflicting files. The files have had code added in several places indicating '>>>>>>> .merge-file_a02536' and '<<<<<<< .merge-file_a07112'. These additions to the code have been saved on the laptop even though the commit is being stopped due to a conflict. I'm unsure as how to proceed. How can I remove these added lines and perform the commit?
Those are the flags identifying the merge conflicts. You need to use third party software to resolve the conflicts to make those extra notations go away properly. You can find many recommendations for multiple operating systems in the stackoverflow question:
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
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot