I'm trying to use BC4 with TortoiseGit as the merge/conflict editor.
But I'm having an annoying issue with BC: TortoiseGit creates 3 files when a conflict resolution is started (.BASE, .LOCAL, .REMOTE)
- when using TortoiseGit internal conflict editor if I cancel the merge operation the files are automatically removed
- when using BC4 if I cancel the merge operation the files are NOT automatically removed.
Is this a BC issue or a TortoiseGit issue ?
Thanks in advance,
Rui
But I'm having an annoying issue with BC: TortoiseGit creates 3 files when a conflict resolution is started (.BASE, .LOCAL, .REMOTE)
- when using TortoiseGit internal conflict editor if I cancel the merge operation the files are automatically removed
- when using BC4 if I cancel the merge operation the files are NOT automatically removed.
Is this a BC issue or a TortoiseGit issue ?
Thanks in advance,
Rui
Comment