-
Bug
-
Resolution: Duplicate
-
Low
-
None
-
1.5.2
-
None
-
Severity 3 - Minor
Steps to reproduce:
- Configure Beyond Compare as merge and diff tool.
- Confirm that the 'external diff' successfully launches Beyond Compare via any Git repository.
- Create a new local Git repository.
- Add several commits.
- Cause a fork, and conflict:
- Developer A deletes a file.
- Developer B edits the file.
- Developer A pushes.
- Developer B pulls (with rebase checkbox selected).
- Rebase is halted due to the conflict.
- Developer B attempts to resolve conflict, by Right Click > Launch External Merge
Expected behaviour:
- A message that the remote file was deleted
- Launch of Beyond Compare, with 'remote' being an empty file.
Actual behaviour:
- Beyond Compare never launches and the merge dialogue remains open.
- duplicates
-
SRCTREEWIN-1417 Deleted files are not shown as removed during merge and don't get removed on resolve
- Closed
- is duplicated by
-
SRCTREEWIN-6150 Merge tool not opening - solution inside comments
- Closed