Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: Conflict with Jun T's texi2any patch

[ This is about git conflicts, not about texinfo. ]

Bart Schaefer wrote on Fri, May 22, 2015 at 10:05:46 -0700:
> This must be something I had left unposted -- I added "makeinfo" fallbacks:
> 
> ++<<<<<<< HEAD
>  +AC_CHECK_PROGS([TEXI2PDF], [texi2pdf], [makeinfo --pdf])
>  +AC_CHECK_PROGS([TEXI2HTML], [texi2html], [makeinfo --html])
> ++=======
> + AC_CHECK_PROGS([TEXI2PDF], [texi2pdf], [])
> + AC_CHECK_PROGS([TEXI2HTML], [texi2any texi2html], [: texi2html])
> + 
> + if test x"$TEXI2HTML" = xtexi2any; then
> +   TEXI2HTML='texi2any -c TEXI2HTML=1'
> + fi
> + 
> ++>>>>>>> master
> 

I find conflicts easier to resolve when 'git config --global
merge.conflictstyle=diff3' is set: <<< foo ||| bar === baz >>> can then
be resolved by applying to foo the changes that make bar into baz, which
is usually an almost mechanical change.  The two-side form quoted above
lacks bar.

Here's a comparison of the two-sided and three-sided forms:
https://subversion.apache.org/docs/release-notes/1.9#three-way-conflict-markers
Messages sorted by: Reverse Date, Date, Thread, Author