Fix #323: Always accept local changes to resolve merge conflicts

[mdboom]

Cc: @mpage

Copilot reviewed 1 out of 1 changed files in this pull request and generated no comments.

[mpage]

Do we also need to pull here and below?

Suggested change

	git stash
	git cherry-pick -n -m1 -Xtheirs stash
	git stash
	git pull -s recursive --rebase
	git cherry-pick -n -m1 -Xtheirs stash

[mpage]

Suggested change

	git stash
	git cherry-pick -n -m1 -Xtheirs stash
	git stash
	git pull -s recursive --rebase
	git cherry-pick -n -m1 -Xtheirs stash

[Copilot]

Copilot reviewed 1 out of 1 changed files in this pull request and generated 2 comments.

Comments suppressed due to low confidence (1)

bench_runner/templates/_benchmark.src.yml:335

• The use of 'git cherry-pick -n -m1 -Xtheirs stash' is unusual and may not work as intended. Consider using 'git stash pop' or 'git stash apply' instead.

git cherry-pick -n -m1 -Xtheirs stash

[Copilot]

The use of 'git cherry-pick -n -m1 -Xtheirs stash' is unusual and may not work as intended. Consider using 'git stash pop' or 'git stash apply' instead.

Suggested change

	git cherry-pick -n -m1 -Xtheirs stash
	git stash pop

[Copilot]

The use of 'git cherry-pick -n -m1 -Xtheirs stash' is unusual and may not work as intended. Consider using 'git stash pop' or 'git stash apply' instead.

Suggested change

	git cherry-pick -n -m1 -Xtheirs stash
	git stash pop

[mpage]

LGTM!