[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: git "cannot merge"
|
From: |
Han-Wen Nienhuys |
|
Subject: |
Re: git "cannot merge" |
|
Date: |
Mon, 04 Dec 2006 14:12:05 +0100 |
|
User-agent: |
Thunderbird 1.5.0.8 (X11/20061107) |
Graham Percival escreveu:
> I finally got git installed, cloned the repo, spent half an hour playing
> with "gitk", etc. Then I made a few small changes, did "git commit"
> after each one. Now I'm trying to send those changes back to the main
> repo.
HI,
to check that your changes area actually what you expect, try viewing
them in gitk, or run git-show
I recommend you to use git.el : just do
M-x git-status
mark files with 'm' and commit with 'c'.
--
Han-Wen Nienhuys - address@hidden - http://www.xs4all.nl/~hanwen
LilyPond Software Design
-- Code for Music Notation
http://www.lilypond-design.com