From: "Middelschulte, Leif" <Leif.Middelschulte@klsmartin.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: git merge banch w/ different submodule revision
Date: Thu, 26 Apr 2018 10:49:42 +0000 [thread overview]
Message-ID: <1524739599.20251.17.camel@klsmartin.com> (raw)
Hi,
we're using git-flow as a basic development workflow. However, doing so revealed unexpected merge-behavior by git.
Assume the following setup:
- Repository `S` is sourced by repository `p` as submodule `s`
- Repository `p` has two branches: `feature_x` and `develop`
- The revisions sourced via the submodule have a linear history
* 1c1d38f (feature_x) update submodule revision to b17e9d9
| * 3290e69 (HEAD -> develop) update submodule revision to 0598394
|/
* cd5e1a5 initial submodule revision
Problem case: Merge either branch into the other
Expected behavior: Merge conflict.
Actual behavior: Auto merge without conflicts.
Note 1: A merge conflict does occur, if the sourced revisions do *not* have a linear history
Did I get something wrong about how git resolves merges? Shouldn't git be like: "hey, you're trying to merge two different contents for the same line" (the submodule's revision)
Thanks in advance,
Leif
next reply other threads:[~2018-04-26 10:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-26 10:49 Middelschulte, Leif [this message]
2018-04-26 17:56 ` git merge banch w/ different submodule revision Stefan Beller
2018-04-26 21:46 ` Jacob Keller
2018-04-26 22:19 ` Stefan Beller
2018-04-30 17:02 ` Heiko Voigt
2018-05-02 7:30 ` Middelschulte, Leif
2018-05-03 16:42 ` Heiko Voigt
2018-05-04 8:29 ` Middelschulte, Leif
2018-05-04 10:18 ` Heiko Voigt
2018-05-04 14:43 ` Elijah Newren
2018-05-07 14:23 ` Middelschulte, Leif
2018-04-27 0:02 ` Elijah Newren
2018-04-27 0:19 ` Elijah Newren
2018-04-27 10:37 ` Middelschulte, Leif
2018-04-28 0:24 ` Elijah Newren
2018-04-28 7:22 ` Jacob Keller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1524739599.20251.17.camel@klsmartin.com \
--to=leif.middelschulte@klsmartin.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).