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

Adding a line in the readme file #135

Closed
wants to merge 2 commits into from
Closed
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
20 changes: 15 additions & 5 deletions .github/workflows/mmerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,21 @@ jobs:
run: |
git config user.email "[email protected]"
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
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
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down