Handle submodule conflicts

Question

Handle submodule conflicts

yairchu opened this issue 9 years ago · 8 comments

Currently shows:

resolve-trivial-conflicts: <SUBMODULE-PATH>: openFile: inappropriate type (is a directory)

Answer 1 · 2015-09-29T07:44:23.000Z

This was fixed by noam in PR #7

Answer 2 · 2015-09-29T07:44:40.000Z

Note that there's nothing smart being done when conflicted submodules exist. Any ideas for what could help here?

Answer 3 · 2015-09-29T10:29:06.000Z

Not sure what git itself does with submodules, but if one's submodule is a fast-forward of the other then it's a trivial conflict.

As for non-trivial conflicts, it should probably propagate to a conflict in the submodule, and then resolve all the trivial conflicts there.. though maybe it's not so trivial

Answer 4 · 2015-09-29T10:52:53.000Z

Then I need to decide if I want to rebase or merge in the submodule :-(

Maybe can have a flag --merge or so that does this.

On Tue, Sep 29, 2015 at 1:29 PM, Yair Chuchem notifications@github.com
wrote:

Not sure what git itself does with submodules, but if one's submodule is a
fast-forward of the other then it's a trivial conflict.

As for non-trivial conflicts, it should probably propagate to a conflict
in the submodule, and then resolve all the trivial conflicts there.. though
maybe it's not so trivial

—
Reply to this email directly or view it on GitHub
#5 (comment)
.

Answer 5 · 2015-09-29T11:38:10.000Z

If the conflicts are during a rebase, default is rebase as well. If they are during merge - merge is the default..

Answer 6 · 2015-09-29T12:37:47.000Z

Any way to detect what's the "current" operation?

If the conflicts are during a rebase, default is rebase as well. If they
are during merge - merge is the default..

—
Reply to this email directly or view it on GitHub
#5 (comment)
.

Answer 7 · 2015-09-29T13:52:21.000Z

when rebasing, "git status" says "You are currently rebasing"

Answer 8 · 2015-09-29T15:02:02.000Z

At every parent rebase commit, there may be conflicts in the child repo.

Does it make sense to do many rebases for each such commit?

What if the child commit requires a rebase --onto, and not an ordinary
rebase?

I think "rebase" has to be chosen manually due to these concerns -- so it
may make more sense to add --rebase or --merge as a flag.

On Tue, Sep 29, 2015 at 4:52 PM, Yair Chuchem notifications@github.com
wrote:

when rebasing, "git status" says "You are currently rebasing"

—
Reply to this email directly or view it on GitHub
#5 (comment)
.