Re: git "cannot merge"

2006-12-04 Thread Han-Wen Nienhuys
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

Re: git "cannot merge"

2006-12-04 Thread Johannes Schindelin
Hi, On Sun, 3 Dec 2006, Graham Percival wrote: > 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. Did you specify the files you want to commit? In contrast to CVS, git is more precis

git "cannot merge"

2006-12-03 Thread Graham Percival
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. Before I git-push, I'm supposed to pull the most recent changes, right? Se