There are various types of merge strategies : Fast Forward. Recursive. Ours. Octopus. Resolve. Subtree. Jan 1, 2020