search

PTC-ALM / TortoiseSI

Windows Explorer Extension to operate the SCM capabilities of PTC Integrity Lifecycle Manager
https://ptc-alm.github.io/TortoiseSI/
8 stars 8 forks source link

Added a fix for Merge conflict which was not resolving any conflict previously. #191

Closed krrish1008 closed 8 years ago

krrish1008 commented 8 years ago

190 Added "resolve" as the command option to fix this issue. now the merge conflict option works as expected.

sharonzhao commented 8 years ago

Tested with build 241 using test case 1107449. "Merge Conflicts" successfully resolves conflicts of the members.

This issue can be closed.

atusek commented 8 years ago

@KristinaTaylor Thanks Kristina

KristinaTaylor commented 8 years ago

@atusek No problem. I figure I can still review code if it's just an addition of an option. ;)