Skip to content

Commit

Permalink
fix: Update forward merge to track remote branch [skip release] (#2627)
Browse files Browse the repository at this point in the history
If for some reason someone has a branch on their forked repository that matches the branch on remote, the commands fails. This change ensures that it always tracks upstream remote instead of what you might have on your own forked repo.

[category:Infrastructure]

Co-authored-by: manuel.carrera <manuel.carrera@workday.com>
  • Loading branch information
mannycarrera4 and manuel.carrera committed Mar 5, 2024
1 parent 9b527c3 commit 8f32464
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/forward-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ jobs:
```
git branch -D merge/${{needs.get-branch-names.outputs.branch}}-into-${{ needs.get-branch-names.outputs.next-branch }} || true
git fetch upstream
git checkout merge/${{needs.get-branch-names.outputs.branch}}-into-${{ needs.get-branch-names.outputs.next-branch }}
git checkout --track upstream/merge/${{needs.get-branch-names.outputs.branch}}-into-${{ needs.get-branch-names.outputs.next-branch }}
git pull upstream merge/${{needs.get-branch-names.outputs.branch}}-into-${{ needs.get-branch-names.outputs.next-branch }} -f
node utils/forward-merge.js
```
Expand Down

0 comments on commit 8f32464

Please sign in to comment.