On 02/14/2011 05:07 PM, Michael Meeks wrote:
> Hi guys,
>
> We are having quite some fun merging git branches with LibreOffice, and
> I stumbled over this just now with master git with hash:
> 00e6ee724640701b32aca27cc930fd6409c87ae2
>
> Setup (some large repos):
>
> git clone git://anongit.freedesktop.org/libreoffice/libs-core
> git checkout integration/dev300_m98
> git remote add stage git://anongit.freedesktop.org/libreoffice/staging/@REPO@
> git fetch stage
>
> Test[1]:
>
> git merge stage/premerge/dev300_m98
the merge has detected a conflict and has annotated the conflicted
file(s). at least one of the conflicting files is
idl/source/cmptools/lex.cxx (you might want to do 'git mergetool' after
you have setup your merge tool)
> git diff idl/source/cmptools/lex.cxx
>
you're diffing the 'unmerged, annotated' file against the original file
before the merge.
your merge is not yet complete, you'll have to resolve the conflicts first
and then commit
> yields:
>
> @@@ -147,11 -147,7 +147,15 @@@ SvToken & SvToken::operator = ( const S
> *************************************************************************/
> void SvTokenStream::InitCtor()
> {
> ++<<<<<<< HEAD
> +#ifdef DOS
> + SetCharSet( CHARSET_ANSI );
> +#else
> SetCharSet( gsl_getSystemTextEncoding() );
> +#endif
> ++=======
> ++ SetCharSet( gsl_getSystemTextEncoding() );
> ++>>>>>>> stage/premerge/dev300_m98
this is the annotation of the conflict
grtz
--
Ferry Huberts
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html