-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
c1cb3c4
commit e7dffb6
Showing
1 changed file
with
2 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -45,8 +45,8 @@ jobs: | |
git config --global user.email "[email protected]" | ||
echo git checkout ${branch_name} | ||
git checkout ${branch_name} | ||
echo "git checkout -d update_truth_for_${branch_name} (delete local if exists)" | ||
git checkout -d update_truth_for_${branch_name} | ||
echo "git branch -d update_truth_for_${branch_name} (delete local if exists)" | ||
git branch -d update_truth_for_${branch_name} | ||
echo "git checkout -b update_truth_for_${branch_name} (create from ${branch_name})" | ||
git checkout -b update_truth_for_${branch_name} | ||
echo git merge -s ours origin/${branch_name}-ref | ||
|