Re: git merge banch w/ different submodule revision

Hi, Am Freitag, den 04.05.2018, 07:43 -0700 schrieb Elijah Newren: > On Fri, May 4, 2018 at 3:18 AM, Heiko Voigt wrote: > > Hi, > > > > On Fri, May 04, 2018 at 08:29:32AM +, Middelschulte, Leif wrote: > > > Am Donnerstag, den 03.05.2018, 18:42 +0200 schrieb

Re: git merge banch w/ different submodule revision

Hi, Am Donnerstag, den 03.05.2018, 18:42 +0200 schrieb Heiko Voigt: > Hi, > > On Wed, May 02, 2018 at 07:30:25AM +, Middelschulte, Leif wrote: > > Am Montag, den 30.04.2018, 19:02 +0200 schrieb Heiko Voigt: > > > On Thu, Apr 26, 2018 at 03:19:36PM -0700, Stefan Bell

Re: git merge banch w/ different submodule revision

Am Montag, den 30.04.2018, 19:02 +0200 schrieb Heiko Voigt: > On Thu, Apr 26, 2018 at 03:19:36PM -0700, Stefan Beller wrote: > > Stefan wrote: > > > See > > > https://github.com/git/git/commit/68d03e4a6e448aa557f52adef92595ac4d6cd4bd > > > (68d03e4a6e (Implement automatic fast-forward merge for su

Re: git merge banch w/ different submodule revision

Hi, firstofall: thank all of you for your feedback. Am Donnerstag, den 26.04.2018, 17:19 -0700 schrieb Elijah Newren: > On Thu, Apr 26, 2018 at 3:49 AM, Middelschulte, Leif > wrote: > > Hi, > > > > we're using git-flow as a basic development workflow. However, doin

git merge banch w/ different submodule revision

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