Hello, Not sure if this is a bug that requires a fix or workaround?
- Subject: no way to resolve conflict of submodule commit ref - Steps to reproduce: - UserA checks out new branch BranchA - UserB checks out new branch BranchB - UserA updates submodule MySubModule - UserA commits to BranchA the updated commit ref for MySubModule - UserA merges into master - UserB updates submodule MySubModule again - UserB commits to BranchB the updated commit ref for MySubModule - UserB tries to create PR back into master - Expected Results: - A Merge Conflict is reported for the different ref commits for MySubmodule. This conflict can be resolved manually - Actual Results - “warning: Failed to merge submodule mantis-core (not checked out)”. - I performed a cmd line merge of master into my branch and resolved any conflicts but the conflict. The submodule does not go away but is no longer reported by ‘git status’ - I believe because the commit ref for the submodule is stored in Git’s object database there’s no way to resolve this that I’m aware of. Any help or guidance is appreciated! Thanks, Noah -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
