Add 'Reset to Remote' button in Repository Management#532
Open
Getslow6 wants to merge 4 commits into
Open
Conversation
Owner
|
Hey @Getslow6, thanks for this PR. I will test and review as soon as I have time. Please bring patience and keep up the good work. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The repository management functionality allows to sync your repository with a remote repository. However, if the remote repository already contains files (e.g. from an earlier wiki and you're setting up Otterwiki from scratch) it is not possible to pull the files, as they will conflict with the files in the local repository (.e.g.
home.md).The solution would be to hard reset to the remote using
git reset --hard origin/main. This overrides the local git repository with the remote repository, after which you can continue with keeping Otterwiki in sync with the remote repository.This PR includes a new 'Reset to Remote' button on the repository management page:
Clicking it will first show a warning, similar to the force push button.
Tests have been included as well.