diff --git a/.github/workflows/mmerge.yml b/.github/workflows/mmerge.yml index 7c9e9320b7..8cff3ec54a 100644 --- a/.github/workflows/mmerge.yml +++ b/.github/workflows/mmerge.yml @@ -15,11 +15,21 @@ jobs: run: | git config user.email "actions@zpqrtbnk.net" git config user.name "Actions" - git fetch --no-tags origin master + git fetch --depth=1 --no-tags origin master git branch master origin/master - git merge master - git push - - name: and then + # because we fetched both other and master with depth=1 we have no history + # and therefore no way to determine whether they are related, so we need to + # specify --allow-unrelated-histories here AND it is *always* going to + # create a merge commit since, again, it cannot verify whether the merge + # already took place + git merge master --allow-unrelated-histories + - name: make changes shell: bash run: | - ls \ No newline at end of file + echo woop>>woop.txt + - name: commit and push back + shell: bash + run: | + # we don't want to add another commit on top of the merge, just shoobi it + git commit --amend -m "wooplala" + git push \ No newline at end of file diff --git a/README.md b/README.md index 5aff729995..7827e8da20 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ Hey! This is my personal Git(Hub) Test Repository where I experiment with Git and GitHub. +Thank you for this test repo ! + If you are new to Git and GitHub and found this repository through Google: feel free to clone the repository and experiment with it! You will not be able to push back to the repository, as it is *my* repository and I cannot let everybody push to it. The right way to do it on GitHub is: 1. fork the repository in your own account,