Git dev deployments #7672
Open
Git dev deployments #7672
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
k-anshul
commented
Jul 30, 2025
|
|
||
| // merge default branch into edit branch | ||
| if force { | ||
| // Maybe instead of merge with the "theirs" strategy should we just reset to the default branch? |
There was a problem hiding this comment.
When doing a force merge of default branch to edit branch should we just reset to default branch ?
k-anshul
commented
Jul 30, 2025
| @@ -167,15 +200,34 @@ func (r *gitRepo) root() string { | |||
|
|
|||
| // commitToEditBranch auto-commits any current changes to the edit branch of the repository. | |||
| // This is done to checkpoint progress when the handle is closed. | |||
| // If there are conflicts, it should drop any local changes. | |||
| // If there are conflicts, it should drop any local changes. Why ?? | |||
There was a problem hiding this comment.
Usually there should not be any changes in edit branch that exist on remote but doesn't exist locally but even if there are it should drop those and commit local since this will be triggered on close or explicit user input
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.
https://linear.app/rilldata/issue/PLAT-94/git-support-for-dev-deployments
TODO: Cleanup git APIs in CLI when UI migrates to API in runtime
Checklist: