StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use 'ours' conflict resolution strategy." am: b6bb694958 am: 3d4bc62f3b am: d7cf2cb557

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

Change-Id: I7a9faedb68db5cb0b7e9a744511c1e0f45a9a6bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-11-04 01:42:30 +00:00
committed by Automerger Merge Worker
parent 9be16c3f8a d7cf2cb557
commit 13cde21b45
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
finalize-step-1.sh
View File

@@ -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