merge strategy


### merge strategies
|Title|
|:-:|
|[Recursive - Default](https://texonom.com/recursive--default-b9bb7a973d6a4d5888abdb4e6d2127b9)|
|[Octopus strategy](https://texonom.com/octopus-strategy-686fd9ec21da401db9c983791c45a6d4)|
|[Resolve](https://texonom.com/resolve-7cdfe88145c746d7874810269e92502c)|
|[Ours](https://texonom.com/ours-2557a9cda81044b69337082820bcb1d7)|
|[Subtree](https://texonom.com/subtree-85ddd76cbfb640c2becac64bbc1e741f)|



> [Git merge strategy options & examples | Atlassian Git Tutorial](https://www.atlassian.com/git/tutorials/using-branches/merge-strategy)







