From: Junio C Hamano <junkio@cox•net>
To: Graham Percival <gpermus@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: git newbie problems
Date: Tue, 05 Dec 2006 17:35:33 -0800 [thread overview]
Message-ID: <7v4ps9byca.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <457611B9.9020907@gmail.com> (Graham Percival's message of "Tue, 05 Dec 2006 16:41:29 -0800")
Graham Percival <gpermus@gmail•com> writes:
> Trying really trivial in-index merge...
> Documentation/user/advanced-notation.itely: needs merge
> fatal: you need to resolve your current index first
You got from a "git pull", which means you were already in
another merge (perhaps failed). That is a no-no.
The error messages need to be cleaned up and be more helpful.
There is no question about it.
> Nope.
> Merging HEAD with c21d3f3e1c77722e50d994763442e6f994b03ac2
> Merging:
> 038b7fc Misc small updates (trying to make git work).
> c21d3f3 Merge branch 'master' of
> ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond
> found 1 common ancestor(s):
> 84219bb don't have input/templates/ any longer.
> fatal: Entry '.gitignore' would be overwritten by merge. Cannot merge.
> No merge strategy handled the merge.
So the question is what you did _before_ initiating this "git pull".
For new people, we recommend to:
* make sure you were on a right branch (I think you are. You
are on your 'master' branch and may not even have any other
branches, which is fine.)
* make sure all your changes are committed.
before initiating a "git pull". And after a conflicted "git
pull", if you choose to punt,
$ git reset --hard
would take you back to the state before you started the pull.
> SUGGESTIONS
>
> The "tutorial introduction to git" looks like a nice document, but it
> assumes that you are in control of the project. For users who aren't in
> control (ie me) this is a problem, because it starts me skimming.
> "Importing a project"... nah, that's not me. "Merging branches"... I
> don't care; I'm going to shove everything into the main branch. "Using
> git for collaboration"... hmm, maybe this is the stuff I need to read.
> But by this point, I've already skimmed through five screens of info, so
> I'm not reading very carefully.
Yes, git caters to too many classes of people.
I've heard people talk about "everyday" document as a good
table-of-contents, primarily because it first breaks down the
userbase into roles and talks about common commands for each
role of the user. I am not in the position to judge the quality
of the document, though.
next prev parent reply other threads:[~2006-12-06 1:35 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <4574AC9E.3040506@gmail.com>
[not found] ` <4574BF70.8070100@lilypond.org>
2006-12-06 0:41 ` git newbie problems Graham Percival
2006-12-06 1:23 ` Jakub Narebski
2006-12-06 9:39 ` Han-Wen Nienhuys
2006-12-06 10:17 ` Jakub Narebski
2006-12-06 10:21 ` Han-Wen Nienhuys
2006-12-06 10:42 ` Johannes Schindelin
2006-12-06 1:35 ` Junio C Hamano [this message]
2006-12-06 22:19 ` Daniel Barkalow
2006-12-06 1:52 ` Tom Prince
[not found] ` <el5608$952$2@sea.gmane.org>
2006-12-06 8:01 ` Graham Percival
[not found] ` <45760545.2010801@gmail.com>
[not found] ` <Pine.LNX.4.63.0612060053400.28348@wbgn013.biozentrum.uni-wuerzburg.de>
[not found] ` <45761451.8020006@gmail.com>
[not found] ` <Pine.LNX.4.63.0612060157020.28348@wbgn013.biozentrum.uni-wuerzburg.de>
2006-12-06 9:55 ` git patch Han-Wen Nienhuys
2006-12-06 10:00 ` Junio C Hamano
2006-12-06 10:22 ` Jakub Narebski
[not found] ` <Pine.LNX.4.63.0612061105220.28348@wbgn013.biozentrum.uni-wuerzburg.de>
[not found] ` <457698E0.80207@lilypond.org>
[not found] ` <Pine.LNX.4.63.0612061147540.28348@wbgn013.biozentrum.uni-wuerzburg.de>
2006-12-06 11:27 ` Han-Wen Nienhuys
[not found] ` <20061206.105251.144349770.wl@gnu.org>
2006-12-06 12:27 ` [PATCH] cvs-migration document: make the need for "push" more obvious Johannes Schindelin
2006-12-06 12:32 ` Jakub Narebski
2006-12-06 13:14 ` Johannes Schindelin
2006-12-06 13:27 ` Jakub Narebski
2006-12-06 13:32 ` New users, was " Johannes Schindelin
2006-12-06 14:52 ` J. Bruce Fields
2006-12-06 14:52 ` Han-Wen Nienhuys
2006-12-06 14:58 ` J. Bruce Fields
2006-12-06 15:05 ` Han-Wen Nienhuys
2006-12-06 15:16 ` Johannes Schindelin
2006-12-06 17:19 ` J. Bruce Fields
2006-12-06 17:24 ` J. Bruce Fields
2006-12-06 17:44 ` Junio C Hamano
2006-12-07 4:18 ` [PATCH] Documentation: reorganize cvs-migration.txt J. Bruce Fields
2006-12-07 5:51 ` Junio C Hamano
2006-12-07 15:21 ` J. Bruce Fields
2006-12-07 14:28 ` Johannes Schindelin
2006-12-07 17:43 ` J. Bruce Fields
2006-12-07 17:50 ` Johannes Schindelin
2006-12-08 3:34 ` J. Bruce Fields
2006-12-08 7:25 ` Junio C Hamano
2006-12-09 3:58 ` J. Bruce Fields
2006-12-06 21:02 ` [PATCH] cvs-migration document: make the need for "push" more obvious Graham Percival
2006-12-06 21:45 ` J. Bruce Fields
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=7v4ps9byca.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox$(echo .)net \
--cc=git@vger$(echo .)kernel.org \
--cc=gpermus@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox