Git

OK

References

https://confluence.atlassian.com/bitbucket/work-with-pull-requests-223220593.html

https://confluence.atlassian.com/bitbucket/resolve-merge-conflicts-704414003.html

https://confluence.atlassian.com/bitbucket/use-a-git-branch-to-merge-a-file-681902555.html

https://git-scm.com/book/es/v2/Git-Tools-Advanced-Merging

https://git-scm.com/docs/git-merge

aaa