After Merge Submodules are not set to the correct Commit

XMLWordPrintable

    • Type: Bug
    • Resolution: Unresolved
    • Priority: Medium
    • None
    • Affects Version/s: 2.0.2
    • Component/s: Git
    • None
    • Severity 2 - Major

      Reproduction:

      • Create a branch
      • In a submodule commit some changes
      • Commit the submodule commit ref change in the parent repo
      • Merge the branch into another branch
      • The merge commit contains the correct submodule commit ref, but the submodule is currently set to the old commit ref, and is listed in the working copy changes

      TL;DR: When merging a branch with submodule changes, we always have to reset the submodule afterwards.

            Assignee:
            Unassigned
            Reporter:
            Fabian E.
            Votes:
            2 Vote for this issue
            Watchers:
            4 Start watching this issue

              Created:
              Updated: