Uploaded image for project: 'Sourcetree for Windows'
  1. Sourcetree for Windows
  2. SRCTREEWIN-1666

External Merge Fails to Launch When Remote File is Deleted and Local Changed

XMLWordPrintable

    • Severity 3 - Minor

      Steps to reproduce:

      1. Configure Beyond Compare as merge and diff tool.
      2. Confirm that the 'external diff' successfully launches Beyond Compare via any Git repository.
      3. Create a new local Git repository.
      4. Add several commits.
      5. Cause a fork, and conflict:
        1. Developer A deletes a file.
        2. Developer B edits the file.
      6. Developer A pushes.
      7. Developer B pulls (with rebase checkbox selected).
      8. Rebase is halted due to the conflict.
      9. 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.

            [SRCTREEWIN-1666] External Merge Fails to Launch When Remote File is Deleted and Local Changed

            Apoorv Singhal (Inactive) added a comment -
            1. SRCTREEWIN-1417

            Apoorv Singhal (Inactive) added a comment - SRCTREEWIN-1417

            James McGuire added a comment - - edited

            Any progress on this one?  Seems like there are a lot of duplicate reports, but this report has been around since 2014.

             

            Still affects v. 3.2.6

            James McGuire added a comment - - edited Any progress on this one?  Seems like there are a lot of duplicate reports, but this report has been around since 2014.   Still affects v. 3.2.6

            Laurent Giroud added a comment -

            All these issues are the same, essentially duplicate of one another:
            SRCTREEWIN-1666

            SRCTREE-2341

            SRCTREEWIN-6434

            SRCTREE-2342

            SRCTREEWIN-7753

            SRCTREEWIN-6715

            Laurent Giroud added a comment - All these issues are the same, essentially duplicate of one another: SRCTREEWIN-1666 SRCTREE-2341 SRCTREEWIN-6434 SRCTREE-2342 SRCTREEWIN-7753 SRCTREEWIN-6715

            balazsh added a comment -

            Same with 1.9.6.1 and toroise merge (without using "custom" setup).
            Also having problem with tortoisemerge and filenames if contains a space...

            balazsh added a comment - Same with 1.9.6.1 and toroise merge (without using "custom" setup). Also having problem with tortoisemerge and filenames if contains a space...

            Vasyl added a comment -

            I even cannot start External diff tool.

            See Bug report

            Vasyl added a comment - I even cannot start External diff tool. See Bug report

            Gideon Koh (Inactive) added a comment -

            A user brought up that this bug is also reproducible the other way around (Remote file changed and local deleted):

            1. Initiate a merge between two branches on a Git repository.
            2. Given that the merge results in a conflict, and the remote branch modifies a file that the local branch deleted.
            3. Invoke Resolve conflict -> Launch External Merge Tool using Beyond Compare 4 as the default external tool.
            4. SourceTree pops up a dialog "Visual Merge in Progress" but the merge tool never comes up.

            Normal merges work fine. This issue only occurs if the local branch deleted a file that the remote branch has modified.

            Gideon Koh (Inactive) added a comment - A user brought up that this bug is also reproducible the other way around (Remote file changed and local deleted): 1. Initiate a merge between two branches on a Git repository. 2. Given that the merge results in a conflict, and the remote branch modifies a file that the local branch deleted. 3. Invoke Resolve conflict -> Launch External Merge Tool using Beyond Compare 4 as the default external tool. 4. SourceTree pops up a dialog "Visual Merge in Progress" but the merge tool never comes up. Normal merges work fine. This issue only occurs if the local branch deleted a file that the remote branch has modified.

            James Rickards added a comment -

            This behaviour occurs with several other merge tools (e.g. Tortoise Merge).
            Behaviour occurs on Windows 8, and Windows 7.

            James Rickards added a comment - This behaviour occurs with several other merge tools (e.g. Tortoise Merge). Behaviour occurs on Windows 8, and Windows 7.

              sstreeting Steve Streeting (Inactive)
              rluispereiramartins RicardoA
              Affected customers:
              11 This affects my team
              Watchers:
              10 Start watching this issue

                Created:
                Updated:
                Resolved: