when using git am to apply patches there might be some conflicts. git am supports 3 way merge (allow fall back on 3way merging if needed) but does not have a support for ours , such as other git merge\rebase operations.

how can git am and tell it to favor ours changes if conflicts arises?

CodePudding user response：

You can't. You'll just have to go resolve these yourself.

Consider semi-automating this using git merge-file, which does have the option. You'll need to retrieve all three input files (merge base, ours, and theirs).