-
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
1f28a15
commit 21cc5a8
Showing
1 changed file
with
5 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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: | | ||
|