Git merge strategy options & examples | Atlassian Git Tutorial
When a piece of work is complete, tested and ready to be merged back into the main line of development, your team has some policy choices to make. What are your merge strategy options? In this article we'll examine the possibilities and then provide some notes on how Atlassian operates.
https://www.atlassian.com/git/tutorials/using-branches/merge-strategy