tree 08ca6144fdfa17be70e80fde3c87472f143b5b11
parent 7e809e130dad68552572b71fbdd6cf30feff75ae
author Sadaf Ebrahimi <sadafebrahimi@google.com> 1674253656 +0000
committer Sadaf Ebrahimi <sadafebrahimi@google.com> 1674255805 +0000

Not aborting merge when there is a conflict

We want to upload the change even when there is a merge conflict and
fix the conflicts in Gerrit.

Test: TreeHugger
Change-Id: I04a0ad604b9222863d5087a1043306bc113e57d4