How do I resolve a conflict in my favour?

In the three-pane editor, ours is the left pane — the branch you are on — and each conflicted hunk can take it with one click. Use Ours in the toolbar does the whole file at once, replaces it, and stages the result.

Before you do it wholesale, two things are worth a moment.

Run Resolve Simple Conflicts first. It settles the hunks that have only one possible answer, so what remains is the set of places where you and they genuinely disagree — which is usually far fewer than the marker count suggested.

Read the right-hand pane. “Ours” during a rebase is not what it is during a merge: a rebase replays your commits onto theirs, so the side labelled ours is the branch you are replaying onto. Taking ours reflexively during a rebase discards your own work, which is the opposite of what you meant.

The middle pane is editable. A hunk whose right answer is neither side is written there.