Skip to content

Conversation

@svc-cli-bot
Copy link

This branch and PR were automatically created following the successful release of v4.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-XXXXXXX@ 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/v4.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

@jfeingold35 jfeingold35 changed the title Filler title. Read description and rename. Main2Dev @W-15819273@ Merging main to dev after v4.2.0 May 28, 2024
Copy link
Contributor

@jfeingold35 jfeingold35 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No conflicts, so approving and merging.

@jfeingold35 jfeingold35 merged commit 1f9b232 into dev May 28, 2024
@jfeingold35 jfeingold35 deleted the m2d/v4.2.0 branch August 7, 2024 15:27
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