Skip to content

Commit

Permalink
Update sync_with_terminal_wiki.yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
charanravi-online authored Apr 26, 2024
1 parent 1f28a15 commit 21cc5a8
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/sync_with_terminal_wiki.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ jobs:

- name: Configure user info
run: |
git config user.email "charanravi.[email protected]"
git config user.email "charanravi-[email protected]"
git config user.name "R Charan"
- name: Fetch changes from terminal-wiki
run: |
git remote add upstream https://github.com/charanravi-online/terminal-wiki.git || true
git fetch upstream
- name: Merge changes excluding README and LICENSE
- name: Merge changes allowing unrelated histories and excluding README and LICENSE
run: |
git merge upstream/main --no-commit --no-ff
git checkout --ours README.md LICENSE
git commit -m "Merge changes from terminal-wiki excluding README and LICENSE"
git merge upstream/main --allow-unrelated-histories --no-commit --no-ff
git checkout --ours README.md LICENSE # Keep local versions of these files
git commit -m "Merge changes from terminal-wiki, excluding README and LICENSE"
- name: Push changes
run: |
Expand Down

0 comments on commit 21cc5a8

Please sign in to comment.