Skip to content

Sync develop to release/20.0#1722

Merged
raman-m merged 5 commits intodevelopfrom
release/20.0
Oct 12, 2023
Merged

Sync develop to release/20.0#1722
raman-m merged 5 commits intodevelopfrom
release/20.0

Conversation

@raman-m
Copy link
Member

@raman-m raman-m commented Oct 9, 2023

@RaynaldM Please approve.
You can understand the problem from emailing thread "Congrats on 20.0.0 release."
This PR is prepared to resolve my mistake I did in #1721 while merging with Rebase option which made a 3 new commits having new hash values, but they don't belong to main branch. It seems GitHub doesn't use fast-forwarding, and creates new commits always. This differs from default Visual Studio settings for git, so VS has more intellectual merging features.
Technically release branch commits are still not delivered to develop. That's why I've created this 2nd PR.

@raman-m raman-m requested a review from RaynaldM October 9, 2023 09:29
@raman-m raman-m self-assigned this Oct 9, 2023
@raman-m raman-m added release Pre/Release (minor, major) gitflow Gitflow workflow and removed release Pre/Release (minor, major) labels Oct 9, 2023
@raman-m raman-m requested a review from TomPallister October 9, 2023 15:37
@raman-m
Copy link
Member Author

raman-m commented Oct 10, 2023

@RaynaldM Hey Ray!
I hope you had a very productive day today. 😉
Also, I appreciate your approval of this PR next morning, please... 🙏

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

gitflow Gitflow workflow

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants