Conflicts

Estimated time: 15 minutes

Overview

Questions

• What do I do when my changes conflict with someone else’s?

Objectives

• Resolve a merge conflict

Welcome to using Git in Official Statistics!

Key Points

• First key point. Brief Answer to questions. (FIXME)