MERGE STRATEGIES

Related Concept

• Fast-Forward vs Non-FF
• Rebase
• Squash
• Handling Conflicts
• Cherry Picking Commits