Git · Senior · Question 10 of 76

What is the difference between -s ours and -X ours in a merge?

Explanation

The ours strategy records a merge but keeps our tree unchanged, discarding all their changes. The ours option of ort merges normally and only picks our side for conflicting hunks.

Further reading

Problem with a question

Git · Senior · question 10

Test yourself

Take the Git · Senior quiz: questions and options are shuffled, and you get a review of your mistakes at the end.

Take this quiz