tree 6bbbcb379432828c97986d5538327ea1cd1e2d93
parent ac60bcdaaf74a5c835072ace98bbdf5815bfbf27
author Alex Buynytskyy <alexbuy@google.com> 1667503746 -0700
committer Alex Buynytskyy <alexbuy@google.com> 1667503746 -0700

Use 'ours' conflict resolution strategy.

We should never use anything from finalization commits.

Bug: 243966946
Test: run locally
Change-Id: I4b0cedd7e82362cc98961e627d0103cfba18fc6d