sm-discuss AT lists.ibiblio.org
Subject: Public SourceMage Discussion List
List archive
- From: seth AT swoolley.homeip.net
- To: Ladislav Hagara <ladislav.hagara AT unob.cz>
- Cc: sm-discuss AT lists.ibiblio.org
- Subject: Re: [SM-Discuss] git and usability
- Date: Tue, 18 Jul 2006 07:38:31 -0700
On Tue, Jul 18, 2006 at 04:33:27PM +0200, Ladislav Hagara wrote:
> Thanks.
> Seems I still have some problems.
> I will try tomorrow.
>
> $ git diff
> $ git checkout -f
> $ git reset --hard
> $ git branch
> devel
> master
> origin
> stable-0.3
> * stable-rc-0.4
> $ git checkout master
> fatal: Untracked working tree file '.gitignore' would be overwritten by
> merge.
These are exactly the kind of messages I was getting.
What version of git are you on? git 1.4.1 might be better.
(If this is the same version you are using then I guess
the version of git didn't matter).
To be honest, git "for the integrator" doesn't seem to work for me yet,
the same as you. I've managed to make some branches, but I haven't
figured out the ideal use for our use cases. I'm hoping arwed chimes
in and describes step-by-step he takes to do everyday spell integrates.
I've been attributing it to the fact that I haven't had time to sit
down with the git docs and really grok it.
Seth
-
Re: [SM-Discuss] git and usability
, (continued)
-
Re: [SM-Discuss] git and usability,
Jeremy Blosser, 07/07/2006
- Re: [SM-Discuss] git and usability, Jeremy Blosser, 07/07/2006
-
Re: [SM-Discuss] git and usability,
Andrew Stitt, 07/07/2006
-
Re: [SM-Discuss] git and usability,
Jeremy Blosser, 07/07/2006
-
Re: [SM-Discuss] git and usability,
Ladislav Hagara, 07/18/2006
-
Re: [SM-Discuss] git and usability,
Jaka Kranjc, 07/18/2006
- Re: [SM-Discuss] git and usability, Treeve Jelbert, 07/18/2006
-
Re: [SM-Discuss] git and usability,
Ladislav Hagara, 07/18/2006
- Re: [SM-Discuss] git and usability, Jaka Kranjc, 07/18/2006
- Re: [SM-Discuss] git and usability, Ladislav Hagara, 07/18/2006
- Re: [SM-Discuss] git and usability, seth, 07/18/2006
- Re: [SM-Discuss] git and usability, Jeremy Blosser, 07/18/2006
-
Re: [SM-Discuss] git and usability,
Jaka Kranjc, 07/18/2006
- Re: [SM-Discuss] git and usability, Andrew, 07/18/2006
- Re: [SM-Discuss] git and usability, Jeremy Blosser, 07/18/2006
- Re: [SM-Discuss] git and usability, Arwed von Merkatz, 07/18/2006
-
Re: [SM-Discuss] git and usability,
Ladislav Hagara, 07/18/2006
-
Re: [SM-Discuss] git and usability,
Jeremy Blosser, 07/07/2006
- Re: [SM-Discuss] git and usability, Andrew, 07/18/2006
- Re: [SM-Discuss] git and usability, Jeremy Blosser, 07/18/2006
-
Re: [SM-Discuss] git and usability,
Jeremy Blosser, 07/07/2006
-
Re: [SM-Discuss] git and usability,
seth, 07/07/2006
- [SM-Discuss] The new Stable grimoire, Matt Donovan, 07/07/2006
Archive powered by MHonArc 2.6.24.