Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nchantarotwong/gha-upmerge
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.3
Choose a base ref
...
head repository: nchantarotwong/gha-upmerge
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 28, 2022

  1. Update entrypoint.sh

    @nchantarotwong
    nchantarotwong authored Jan 28, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    173815e View commit details

  2. removed --no-ff

    @nchantarotwong
    nchantarotwong authored Jan 28, 2022
    Copy the full SHA
    4fa82ca View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 entrypoint.sh
2 changes: 1 addition & 1 deletion entrypoint.sh
View file
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ echo
set -o xtrace

# Do the merge
git merge --no-ff --no-edit $INPUT_FROM_BRANCH --allow-unrelated-histories --strategy-option ours
git merge --no-edit $INPUT_FROM_BRANCH --allow-unrelated-histories -X theirs --squash

# Push the branch
git push --force origin $INPUT_TO_BRANCH