git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Anand Kumria <wildfire@progsoc.org>
To: git@vger.kernel.org
Subject: When a merge turns into a conflict
Date: Thu, 6 Dec 2007 04:49:27 +0000 (UTC)	[thread overview]
Message-ID: <pan.2007.12.06.04.49.25@progsoc.org> (raw)


Hi,

I've just had an odd experience with git (1.5.3.1) and wondered if this 
was a known issue.

One of my co-developers has a project, with a README.txt file.  I branch 
from it and begin some edits:

	- make it more AsciiDoc like (ala git)

	- put in the README.txt a few patches that need to be applied

I had no issues 'git add' the file, and performing changes.

However when my colleague came to merge my patches in; git complained 
that the file had conflict because:

	a. it found the ========= AsciiDoc header line

	b. it found the diff markers in the file

I do not know git well enough to know if this is a heurestic that can be 
tweaked via the config file or something else. I am presently learning 
git-filter-branch so I can prepare something to show -- but I just wanted 
to flag and see if anyone else had had the same issue.

Thanks,
Anand

             reply	other threads:[~2007-12-06  4:50 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-12-06  4:49 Anand Kumria [this message]
2007-12-06  5:51 ` When a merge turns into a conflict Junio C Hamano

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=pan.2007.12.06.04.49.25@progsoc.org \
    --to=wildfire@progsoc.org \
    --cc=git@vger.kernel.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://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).