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

GitFlow: Hand merge main into develop 2022-04-28 #142

Merged

Conversation

mathomp4
Copy link
Member

Hand merge gitflow due to conflict.

@mathomp4 mathomp4 added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label Apr 28, 2022
@mathomp4 mathomp4 self-assigned this Apr 28, 2022
@mathomp4 mathomp4 requested a review from a team as a code owner April 28, 2022 14:49
@mathomp4 mathomp4 merged commit c504bc7 into develop Apr 28, 2022
@mathomp4 mathomp4 deleted the merge/mathomp4/handmerge-main-into-develop-GOCART-2022Apr28 branch April 28, 2022 14:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0 diff The changes in this pull request have verified to be zero-diff with the target branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants