Glossary: Git Beyond the Basics
merge base
The last commit two branches share, where both sides started. Showing it inside conflicts helps you see what each side changed.
Glossary: Git Beyond the Basics
The last commit two branches share, where both sides started. Showing it inside conflicts helps you see what each side changed.