Fixes #366 Add merge to sync flow #376
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
isc-tleavitt
requested changes
Jun 24, 2024
|
One more thing to add here: when a new branch is created, it should be created based on the remote branch configured in this new setting. That will be key to the feature branch workflow. |
isc-tleavitt
requested changes
Jun 25, 2024
| @@ -405,6 +431,8 @@ ClassMethod Sync(Msg As %String) As %Status | |||
| do ..Pull() | |||
| do ..SyncCommit(Msg) | |||
| do ..Push() | |||
| do ..MergeDefaultRemoteBranch() | |||
|
|
|||
There was a problem hiding this comment.
We need to Push after the merge as well, so that the merge is reflected in the remote.
isc-tleavitt
approved these changes
Jun 25, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Now allows users to configure a default branch to merge from during the sync flow before pushing