public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Jeff Garzik <jeff@garzik•org>
To: Git Mailing List <git@vger•kernel.org>
Subject: git 1.4.0 usability problem
Date: Sun, 18 Jun 2006 09:40:06 -0400	[thread overview]
Message-ID: <449557B6.1080907@garzik.org> (raw)

Now that kernel 2.6.17 is out, I updated all my repositories to be based 
against that kernel.  And for each repository I updated, my merge was 
rejected, due to an error similar to:

> fatal: Untracked working tree file '.gitignore' would be overwritten by merge.

I am only able to merge if I delete files in the working directory, so 
that git stops complaining on merge.

This behavior is new with git 1.4.0, which Fedora Extras just added.  I 
verified that merges work as expected in git 1.3.3, the last version 
Fedora Extras shipped prior to 1.4.0.

This behavior is a definite regression, that impacts workflow :(

Here is how to reproduce:

git clone -l $url/torvalds/linux-2.6.git tmp-2.6
cd tmp-2.6
cp .git/refs/tags/v2.6.12 .git/refs/heads/tmp
git checkout -f tmp
git pull . master
# watch OBVIOUS FAST-FORWARD MERGE complain about untracked
# working tree files

Regards,

	Jeff

next             reply	other threads:[~2006-06-18 13:40 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-06-18 13:40 Jeff Garzik [this message]
2006-06-18 16:43 ` git 1.4.0 usability problem Ryan Anderson
2006-06-18 22:27   ` Ryan Anderson
2006-06-18 19:30 ` Junio C Hamano
2006-06-18 22:25 ` Junio C Hamano
2006-06-18 23:01   ` Jeff Garzik
2006-06-19  3:11     ` Junio C Hamano
2006-06-20  8:36       ` Jeff Garzik
2006-06-20  9:16         ` Ryan Anderson
2006-06-20  9:35         ` Junio C Hamano
2006-06-20  9:50           ` [PATCH] checkout -f: do not leave untracked working tree files Junio C Hamano
2006-06-20 11:01             ` Santi Béjar
2006-06-20 11:18               ` Junio C Hamano
2006-06-20 11:27                 ` Alexander Litvinov
2006-06-20 11:51                   ` Junio C Hamano
2006-06-20 12:08                     ` Alexander Litvinov
2006-06-20 14:07             ` Carl Worth

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=449557B6.1080907@garzik.org \
    --to=jeff@garzik$(echo .)org \
    --cc=git@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox