sm-discuss AT lists.ibiblio.org
Subject: Public SourceMage Discussion List
List archive
- From: Pieter Lenaerts <e-type AT sourcemage.org>
- To: sm-discuss AT lists.ibiblio.org
- Subject: Re: [SM-Discuss] git problem
- Date: Thu, 22 Jun 2006 16:46:37 +0200
Op do, 22-06-2006 te 14:57 +0200, schreef Treeve Jelbert:
> what has gone wrong here?
> It was working yesterday.
you probably reset a change that added .gitignore, while the reset
didn't remove it.
move the file out of there and pull should work.
git-status might show more files that stayed there and the pull will try
to overwrite. it stops on the first problem.
--
Pieter Lenaerts
Source Mage GNU/Linux
http://www.sourcemage.org - "Linux so advanced it may well be magic"
Attachment:
signature.asc
Description: Dit berichtdeel is digitaal ondertekend
-
[SM-Discuss] git problem,
Treeve Jelbert, 06/22/2006
- Re: [SM-Discuss] git problem, Pieter Lenaerts, 06/22/2006
-
Re: [SM-Discuss] git problem,
Jeremy Blosser, 06/22/2006
-
Re: [SM-Discuss] [other] Re: git problem,
Treeve Jelbert, 06/22/2006
-
Re: [SM-Discuss] [other] Re: git problem,
Jeremy Blosser, 06/22/2006
- Re: [SM-Discuss] [other] Re: git problem, Arwed von Merkatz, 06/22/2006
-
Re: [SM-Discuss] [other] Re: git problem,
Jeremy Blosser, 06/22/2006
-
Re: [SM-Discuss] [other] Re: git problem,
Treeve Jelbert, 06/22/2006
Archive powered by MHonArc 2.6.24.