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

submodule not visible in left pane when merge resulted in submodule conflict

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Unresolved
    • Icon: Medium Medium
    • None
    • 2.4.7.0
    • None
    • Severity 3 - Minor

      When a merge results in a conflict in a submodule, then this submodule is not shown in left pane. I used the submodule in the left pane to navigate to submodule with the conflict to resolve the conflict. Now I have to open the submodule by opening a new tab and then I can either use a bookmark or I have to look for submodule on my system.

            [SRCTREEWIN-8297] submodule not visible in left pane when merge resulted in submodule conflict

            minnsey added a comment -

            Is the conflict in the .gitmodules file itself, i.e. does it now contain <<<<< entries?

            If so the upcoming 2.5 release should improve the error handling in this situation, by flagging up the corrupt .gitmodules file, but ntil the file is fixed git can't parse it, so Sourcetree can't display its contents.

            minnsey added a comment - Is the conflict in the .gitmodules file itself, i.e. does it now contain <<<<< entries? If so the upcoming 2.5 release should improve the error handling in this situation, by flagging up the corrupt .gitmodules file, but ntil the file is fixed git can't parse it, so Sourcetree can't display its contents.

              Unassigned Unassigned
              af497be49727 Erik Zijp
              Affected customers:
              0 This affects my team
              Watchers:
              2 Start watching this issue

                Created:
                Updated: