Skip to content

Commit

Permalink
fix: Update dev_to_qa_code_sync.yml
Browse files Browse the repository at this point in the history
Added --allow-unrelated-histories: This flag allows merging branches that do not share a common history.
  • Loading branch information
amogh-daryapurkar authored May 29, 2024
1 parent 2c0ff3c commit c1216aa
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/dev_to_qa_code_sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Merge changes excluding fstab.yaml
run: |
git merge --no-commit --no-ff pricefx-eds-main
git merge --no-commit --no-ff --allow-unrelated-histories pricefx-eds-main
git reset HEAD fstab.yaml
git checkout -- fstab.yaml
git commit -m "Sync main branch from pricefx-eds, excluding fstab.yaml"
Expand Down

0 comments on commit c1216aa

Please sign in to comment.