Implement checkout of remote branches #1516
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
Collaborator
Author
|
Converting to draft after possible problem with setting upstream. |
added 2 commits
February 3, 2025 12:36
# Conflicts fixed: # src/FolderManager/ProjectFolderItem.vala # src/Services/MonitoredRepository.vala
zeebok
approved these changes
Apr 2, 2025
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.
Fixes #1156
Note that the overwriting part of this issue is down to using
Ggit.CheckoutStategy.FORCEwhen checking out the other branch.Ggit.CheckoutStrategy.SAFEwas tried but resulted in unwanted staged files representing the reverse of the changes made to the other branch (but these are not visible in Code). There are many otherGgit.CheckoutStrategyflags available but it is not clear which if any of these would be better.The solution adopted here is to advise the user to back out and resolve the uncommitted changes before switching branch but to offer to overwrite the changes anyway.