Merge Conflict function does not work as expected

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

Merge Conflict function does not work as expected #190

Closed KristinaTaylor closed 8 years ago

KristinaTaylor commented 8 years ago

The command being used in TortoiseSI to resolve merges needs to be changed. It's not working as expected.

The integration should be running: si merge --resolve "member name"

This maps to RFC 1096570.

KristinaTaylor commented 8 years ago

Closing based on the testing note from @sharonzhao on the pull request: "Tested with build 241 using test case 1107449. "Merge Conflicts" successfully resolves conflicts of the members.

This issue can be closed."