Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d4bc62f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use 'ours' conflict resolution strategy." am: b6bb6949 

Original change: https://android-review.googlesource.com/c/platform/build/+/2285753



Change-Id: I38baef692c8f94ee650fc33263230004c6a38ae4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c5985788 b6bb6949

finalize-step-1.sh

+3 −3
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ 


# set -ex



function revert_local_changes() {

function revert_to_unfinalized_state() {

    repo forall -c '\

        git checkout . ; git revert --abort ; git clean -fdx ;\

        git checkout @ ; git b fina-step1 -D ; git reset --hard; \

        repo start fina-step1 ; git checkout @ ; git b fina-step1 -D ;\

        previousHash="$(git log --format=%H --no-merges --max-count=100 --grep ^FINALIZATION_STEP_1_SCRIPT_COMMIT | tr \n \040)" ;\

        if [[ $previousHash ]]; then git revert --no-commit --strategy=ort --strategy-option=theirs $previousHash ; fi ;'

        if [[ $previousHash ]]; then git revert --no-commit --strategy=ort --strategy-option=ours $previousHash ; fi ;'

}



function commit_changes() {
@@ -31,7 +31,7 @@ function finalize_step_1_main() { 


    repo selfupdate



    revert_local_changes

    revert_to_unfinalized_state



    # vndk etc finalization

    source $top/build/make/finalize-aidl-vndk-sdk-resources.sh