Hey guys,
I'm using Git for Windows 2.3.6. There is a bit of confusion I have
with regards to how submodule conflicts are resolved/handled during a
rebase.
Suppose I have a branch with 10 commits on it, 3 of those commits
contain a change to the same (and only) submodule in the repository.
When
On Tue, Apr 28, 2015 at 9:34 AM, Robert Dailey rcdailey.li...@gmail.com wrote:
Hey guys,
I'm using Git for Windows 2.3.6. There is a bit of confusion I have
with regards to how submodule conflicts are resolved/handled during a
rebase.
Suppose I have a branch with 10 commits on it, 3 of
On Tue, Apr 28, 2015 at 09:34:06AM -0500, Robert Dailey wrote:
Suppose I have a branch with 10 commits on it, 3 of those commits
contain a change to the same (and only) submodule in the repository.
When I rebase this branch onto the tip of its parent branch, I get a
conflict in each of the 3
On Tue, Apr 28, 2015 at 11:49 AM, Heiko Voigt hvo...@hvoigt.net wrote:
On Tue, Apr 28, 2015 at 09:34:06AM -0500, Robert Dailey wrote:
Suppose I have a branch with 10 commits on it, 3 of those commits
contain a change to the same (and only) submodule in the repository.
When I rebase this branch
On Tue, Apr 28, 2015 at 01:19:00PM -0500, Robert Dailey wrote:
On Tue, Apr 28, 2015 at 11:49 AM, Heiko Voigt hvo...@hvoigt.net wrote:
On Tue, Apr 28, 2015 at 09:34:06AM -0500, Robert Dailey wrote:
Suppose I have a branch with 10 commits on it, 3 of those commits
contain a change to the same
5 matches
Mail list logo