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

how to apply the history changes #69

Closed
ctf0 opened this issue Apr 15, 2019 · 8 comments
Closed

how to apply the history changes #69

ctf0 opened this issue Apr 15, 2019 · 8 comments

Comments

@ctf0
Copy link

ctf0 commented Apr 15, 2019

am not sure if its possible but is there anyway where you can open the history file and apply the changes like git ?

@zabel-xyz
Copy link
Owner

I'm not sure what you want...

For complete replace
There is the item menu "Restore" to replace current file with the history version.
see menu in tree

or Partial
Compare history and current version. You can copy lines from history to current version in diff editor.

@ctf0
Copy link
Author

ctf0 commented Apr 15, 2019

many thanx for the img as eveytime i use restore i was getting an error, so now i actually know how to use it. "maybe remove it from the command panel ?"

but i was talking about the diff tool, is there a way to show the same panel vscode git use above each diff block where u chose to either merge or ignore ?
so instead of manually coping the lines from history, u just press a btn

@zabel-xyz
Copy link
Owner

Sorry, but diff tool is a vscode feature. Contact vscode team if you want some improvement.

@zabel-xyz
Copy link
Owner

If you get an error when you restore, please give me some details to fix this issue

@ctf0
Copy link
Author

ctf0 commented Apr 16, 2019

as the restore command is available in the command panel, so using it without having an opened diff view will give an error.

if there is away to only enable it when the diff view is visible it would be very helpful

@zabel-xyz
Copy link
Owner

The command restore is only for the popupmenu in the tree. So, I'll remove it from command panel.

I'll perhaps implement something else when a history file is open or in the diff view, I agree it could be helpful.

@askhogan
Copy link

askhogan commented May 20, 2019

@zabel-xyz Thank you for this great tool. As a user, coming from Webstorm, where there was built in local history, this tool feels like home. Thank you for allowing users to save outside the workspace (awesome) and also allowing users to configure options vs being too opinionated about it - been surprised that many vs code extensions do not allow you to configure the full options. Your tool exposing a full range of options is super helpful.

One tip - hopefully helps others - my diff was not working in VS code until I added the setting below to settings.json

"diffEditor.renderSideBySide": false

@zabel-xyz
Copy link
Owner

Thank you for your fix, but I have this isssue in progress and already fix this but not published yet.
Dont't close issues if it is in progress, thank you.

@ctf0 ctf0 closed this as completed Mar 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants