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

fix: Update forward merge to track remote branch [skip release] #2627

Merged
merged 1 commit into from
Mar 5, 2024

Conversation

mannycarrera4
Copy link
Contributor

Summary

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.

Release Category

Infrastructure


Checklist

For the Reviewer

  • PR title is short and descriptive
  • PR summary describes the change (Fixes/Resolves linked correctly)
  • PR Release Notes describes additional information useful to call out in a release message or removed if not applicable
  • Breaking Changes provides useful information to upgrade to this code or removed if not applicable

Where Should the Reviewer Start?

Areas for Feedback? (optional)

  • Code
  • Documentation
  • Testing
  • Codemods

Testing Manually

Screenshots or GIFs (if applicable)

Thank You Gif (optional)

Copy link

cypress bot commented Mar 5, 2024

Passing run #7020 ↗︎

0 909 3 0 Flakiness 0
⚠️ You've recorded test results over your free plan limit.
Upgrade your plan to view test results.

Details:

Merge 6945cc5 into 9b527c3...
Project: canvas-kit Commit: afd1117349 ℹ️
Status: Passed Duration: 15:37 💡
Started: Mar 5, 2024 4:11 PM Ended: Mar 5, 2024 4:27 PM

Review all test suite changes for PR #2627 ↗︎

@alanbsmith alanbsmith merged commit 8f32464 into Workday:master Mar 5, 2024
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants