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

[BUG] renaming study / assay conflicts with commit reset #205

Closed
Brilator opened this issue Jun 28, 2024 · 6 comments
Closed

[BUG] renaming study / assay conflicts with commit reset #205

Brilator opened this issue Jun 28, 2024 · 6 comments
Labels
Type: Feature Request This item is confirmed by the maintainers to be a request for a new feature

Comments

@Brilator
Copy link
Member

  1. rename e.g. study via context menu
  2. go to commit panel (see changes= removed files old-studyName, added files new-studyName)
  3. Click "reset" (i.e. git reset --hard)
  4. Bug: added files new-studyName still present
@github-actions github-actions bot added the Status: Needs Triage This item is up for investigation. label Jun 28, 2024
@Brilator
Copy link
Member Author

tested with 2b23c92

@JonasLukasczyk
Copy link
Collaborator

This is expected behavior. Git reset does only restore all tracked files form a specific commit to the state of that commit. Other untracked files (for example those generated by copies) are not deleted by git. We could offer the following feature: a one button solution that deletes the entire ARC and performs a fresh clone. Then the ARC is completely reset to the state of the remote repo. HOWEVER: Any local commits not pushed to the remote will be lost plus all untracked files. So I do not know if this does more harm than good.

@JonasLukasczyk JonasLukasczyk added Type: Feature Request This item is confirmed by the maintainers to be a request for a new feature and removed Status: Needs Triage This item is up for investigation. labels Jul 5, 2024
@JonasLukasczyk
Copy link
Collaborator

JonasLukasczyk commented Sep 24, 2024

@Brilator I suggest the following feature: if users click on the Reset button they will be presented with a dialog in which they can choose from the following options:

  1. Soft Reset: all files tracked by git will be reset to the last commited version, changes to those files are lost
  2. Hard Reset: the content of the ARC is deleted including files not tracked by git, and then the files of the last commit are restored.

Should I add this?

@Brilator
Copy link
Member Author

Sounds good to me

@Brilator
Copy link
Member Author

For hard reset add a clear warning about possible data loss / making sure to have a copy.

@JonasLukasczyk
Copy link
Collaborator

Feature added in dfb05aa

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Feature Request This item is confirmed by the maintainers to be a request for a new feature
Projects
Status: Done
Development

No branches or pull requests

2 participants