zsh-workers
 help / color / mirror / code / Atom feed
From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Subject: Re: Conflict with Jun T's texi2any patch
Date: Sat, 23 May 2015 10:13:00 +0000	[thread overview]
Message-ID: <20150523101300.GD1889@tarsus.local2> (raw)
In-Reply-To: <150522100546.ZM25066@torch.brasslantern.com>

[ 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


  parent reply	other threads:[~2015-05-23 10:13 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-22 17:05 Bart Schaefer
2015-05-22 21:27 ` Peter Stephenson
2015-05-23 10:13 ` Daniel Shahaf [this message]
2015-05-23 16:47 ` Jun T.

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150523101300.GD1889@tarsus.local2 \
    --to=d.s@daniel.shahaf.name \
    --cc=zsh-workers@zsh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).