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

SVN Merge Support #618

Closed
adam-stamand opened this issue Jun 20, 2019 · 8 comments · Fixed by #1540
Closed

SVN Merge Support #618

adam-stamand opened this issue Jun 20, 2019 · 8 comments · Fixed by #1540

Comments

@adam-stamand
Copy link

I apologize if this has already been addressed, but I can't find any information about it. Does this plugin support SVN Merge? If not, do other users just use the CLI when it comes to merging?

@JohnstonCode
Copy link
Owner

The extension does not currently support merge. I use the cli to merge

@adam-stamand
Copy link
Author

Understood, thanks for the information. I think merging with the ability to view and resolve conflicts within vscode would be a very handy feature.

Thanks again

@mctunes
Copy link

mctunes commented Aug 15, 2019

I second this feature request. The extension is fantastic, and merging in the terminal is no problem, but merging and resolving conflicts through the UI would be awesome!

WAWAW

@lpvezina
Copy link

+1 for this feature

@rpetrik
Copy link

rpetrik commented Jul 21, 2020

+1

2 similar comments
@liucien
Copy link

liucien commented Sep 4, 2020

+1

@hallsamuel90
Copy link

+1

@KrestenHelstrup
Copy link

+1
Would really improve my workflow :)

@JohnstonCode JohnstonCode linked a pull request Nov 8, 2021 that will close this issue
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.

8 participants