git@vger.kernel.org mailing list mirror (one of many)
 help / Atom feed
From: Stefan Beller <sbeller@google.com>
To: "FIGADERE, LAURENT" <laurent.figadere@atos.net>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: 2.15.1 - merge with submodule output issue
Date: Tue, 30 Jan 2018 14:02:12 -0800
Message-ID: <CAGZ79kab9oeZq4BJNBPaXA_uso3WQh_FBSE807E=ftBKvujsXQ@mail.gmail.com> (raw)
In-Reply-To: <DDD544204D3240408540BFCC028E06882F12F237@FRCRPVV9EX5MSX.ww931.my-it-solutions.net>

On Tue, Jan 30, 2018 at 7:42 AM, FIGADERE, LAURENT
<laurent.figadere@atos.net> wrote:
> Dear git,
>
> I use since few weeks now git 2.15.1.
>
> I did few trials but please find here my outputs.
>
> To reproduce:
> Use a top module git which include a submodule
> First step: from a work area, I changed selected version of submodule in master branch.
> Then git add + git commit + git push
>        A new commit on master branch has been published on my origin repository with the version v1.2 of submodule
>
> Second step: in my second workarea, I created a user branch mybranch, then selected another release of submodule
> I added the update and then commit in mybranch.
>        A new commit with release v2.0 of submodule is in my last SHA1 of mybranch
>
> Last step: in the second workarea, in mybranch, I first run ‘git fetch’ and then ‘git merge origin/master’
> I got a CONFLICT message of course due to the 2 different versions of submodule.
> Here the message:
> warning: Failed to merge submodule submodule (commits don't follow merge-base)
> Auto-merging submodule
> CONFLICT (submodule): Merge conflict in submodule
> Automatic merge failed; fix conflicts and then commit the result.
>
> Now I thought that the command ‘git submodule’ provided an output with both versions of modules (local and remote).
> But this is not the case in my environment:
> [15:20:10] $ git submodule status
> U0000000000000000000000000000000000000000 submodule
>
> And when I run the mergetool command I have this output:
> [14:54:41] $ git mergetool
> Merging:
> submodule
> Submodule merge conflict for 'submodule':
>   {local}: submodule commit 08f86f2404d9f8f616262971a3127e69f39f9d11
>   {remote}: submodule commit b3dd6fde4f02258b88ad0b2dba6474c126b499f7
> Use (l)ocal or (r)emote, or (a)bort?
>
> So, it means it’s not usefull to determine which version has to be selected.
> Is it a bug or perhaps I make something wrong?

It's not a bug, but the real feature has not been implemented yet.

      reply index

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-30 15:42 FIGADERE, LAURENT
2018-01-30 22:02 ` Stefan Beller [this message]

Reply instructions:

You may reply publically 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='CAGZ79kab9oeZq4BJNBPaXA_uso3WQh_FBSE807E=ftBKvujsXQ@mail.gmail.com' \
    --to=sbeller@google.com \
    --cc=git@vger.kernel.org \
    --cc=laurent.figadere@atos.net \
    /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

git@vger.kernel.org mailing list mirror (one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/
       or Tor2web: https://www.tor2web.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox