[TYPO3-core] Incubator troubles

[Markus Klein]

Hi Jigal,

Sorry, then I also have no idea atm why gerrit has problems with merging.
Time for the GIT geniuses to jump into tracks.

Kind regards
Markus


> -----Original Message-----
> From: typo3-team-core-bounces at lists.typo3.org [mailto:typo3-team-core-
> bounces at lists.typo3.org] On Behalf Of Jigal van Hemert
> Sent: Sunday, November 27, 2011 11:45 PM
> To: typo3-team-core at lists.typo3.org
> Subject: Re: [TYPO3-core] Incubator troubles
> 
> Hi Markus,
> 
> On 27-11-2011 22:52, Markus Klein wrote:
> > I'm not sure if this might be related, but can you check if the git
> > config for the submodule includes autosetuprebase=remote? If not, I
> > guess git merged some code which prohibits fast-forwarding now.
> 
> In .gitconfig there is
> 
> [branch]
> 	autosetuprebase = remote
> 
> Other than that, I have no idea what you are talking about.
> 
> --
> Kind regards / met vriendelijke groet,
> 
> Jigal van Hemert.
> _______________________________________________
> Before posting to this list, please have a look to the posting rules on the
> following websites:
> 
> http://typo3.org/teams/core/core-mailinglist-rules/
> http://typo3.org/development/bug-fixing/diff-and-patch/
> _______________________________________________
> TYPO3-team-core mailing list
> TYPO3-team-core at lists.typo3.org
> http://lists.typo3.org/cgi-bin/mailman/listinfo/typo3-team-core