svn-scm: No diff for conflicted files
Clicking on conflicted files in the source control sidebar does not do anything. At the least, it could open up the file normally where we could perform conflict resolution.
On a related note, the right click options for conflicted files Open changes with BASE/HEAD don’t do anything.
About this issue
- Original URL
- State: closed
- Created 6 years ago
- Comments: 16 (16 by maintainers)
Commits related to this issue
- Merge pull request #166 from edgardmessias/fix_162 Fixed no diff for conflicted files (Close #162) — committed to JohnstonCode/svn-scm by edgardmessias 6 years ago
@johnjacobkenny, Update the
README.mdwith new config optionsYeah, nice first issue. Just need to look at the commands in the package.json and add checks for conflicts. Just reference the external check that are already there.
You will also need to edit the resource.ts and add a check for changes in the
get command()function and return a open file command instead.