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

Main2Dev @W-16608399@ Merging main to dev after v5.0.0-alpha-2 #138

Merged
merged 4 commits into from
Sep 24, 2024
Merged

Conversation

svc-cli-bot
Copy link
Collaborator

This branch and PR were automatically created following the successful release of v1.2.0.
It must be MERGED into dev, NOT SQUASHED OR REBASED. Squashing or rebasing this branch onto dev can cause potentially irreconcilable merge conflicts later.
As an additional safeguard and reminder, the title of this PR MUST include the word 'merging' in the description portion of the PR title, e.g., 'Main2Dev @w-xxxxxx@ Merging main to dev after vX.Y.Z'.
If there are conflicts between dev and this branch, you should do the following locally:

  • $ git checkout dev
  • $ git pull
  • $ git fetch --all
  • $ git checkout m2d/v1.2.0
  • $ git pull origin dev --no-rebase # You MUST include this flag, or someone's day will be ruined.
  • Resolve the merge conflicts manually. When in doubt, ask the code's author for help.
  • $ git commit
  • $ git push

@jag-j jag-j changed the title Filler title. Read description and rename. Main2Dev @W-16608399@ Merging main to dev after v5.0.0-alpha-2 Sep 24, 2024
@jag-j jag-j merged commit 1d0869d into dev Sep 24, 2024
7 checks passed
@jag-j jag-j deleted the m2d/v1.2.0 branch September 24, 2024 17:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants