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.

Sign up for GitHub

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

Jump to bottom

TFS merge resolve conflict is broken for java files with this addin installed #34

Open
c-romeo opened this issue Aug 5, 2015 · 0 comments
Open

TFS merge resolve conflict is broken for java files with this addin installed #34

c-romeo opened this issue Aug 5, 2015 · 0 comments

Comments

@c-romeo
Copy link

c-romeo commented Aug 5, 2015

The Merge editor is replaced by Java editor which doesn't have an accept changes feature and therefore I can't resolve conflicts anymore being forced to disable the plugin
Regards,
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@c-romeo