Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Checkout_theirs #164

Merged
merged 4 commits into from
Aug 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions beta/beta-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,9 @@ jobs:
git config user.name "Mikl Wolfe"
git config user.email "wolfemikl@gmail.com"
git checkout main
git pull --rebase=false --autostash --no-edit --allow-unrelated-histories origin main
git reset --soft ${BRANCH}
git merge --allow-unrelated-histories ${BRANCH}
git checkout --theirs .
git add .
git commit -am 'Beta branch'
git checkout -b beta-branch
git push -fu origin beta-branch
gh pr create --title ${BRANCH} --body 'Beta branch' --base main --head beta-branch
8 changes: 4 additions & 4 deletions beta/beta-compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
run: |
git checkout -b beta-compile
echo $(gh pr list -s open --json)
for pull_request in $(gh pr list -s open --json branch); do
echo "Merge ${pull_request}"
git merge origin/${pull_request}
done
# for pull_request in $(gh pr list -s open --json branch); do
# echo "Merge ${pull_request}"
# git merge ${pull_request}
# done

- name: Push to Main
run: |
Expand Down