Merge quickly ignoring conflicts

git checkout your-branch \
  && git merge -X ours main -m "Merge main (prefer branch changes on conflicts)" \
  && git push