Now What?

[Jon Loeliger <jdl@freescale.com>]

The Other Day, I offered to help write up some parts of
a "Something weird just happened.  Now What?" document.

So, I'm now soliciting suggestions and/or tips that can
be thrown together to form the basis of that document.

I have a few ideas and a rough outline up my sleeve, but
I am curious to know what _you_ think needs to be covered.

I think one of the most crucial aspects that needs to be
covered well is the "Merge Failed" problem.  So, for starters,
I'd like to get your suggestions on this particular issue.
I know when I see the dreaded "merge by hand" message I
often sit and stare, pondering "Now what?"

I feel that an explanation of all of the behind-the-scripts-
in-.git communication files is needed.  In particular these:

    FETCH_HEAD
    MERGE_HEAD
    LAST_MERGE
    MERGE_MSG

These need to be mentioned and explained because they
frequently form exactly the critical missing link or
starting point after a failed fetch or merge.

Finally, a procedure or style question.  Should this
write-up be in the form of a structured FAQ?  A stand-alone
expository document?

Thanks,
jdl