git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: merging confusion and question

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 10, 2012, 20:16 UTC
Message-ID
<7vy5lmijtl.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CABURp0q6OXF5Mu3m20z5ZwL4kz0A0HgZynVMLZZBMNXtga01Vg@mail.gmail.com>
Phil Hord <phil.hord@gmail.com> writes:
> I agree that 'git reset --hard' should be mentioned in the hint for
> newbies, but this conflicts with my desire to avoid giving chainsaws
> to toddlers.
Exactly.  So what are you suggesting?

Perhaps force the user to go through a series of quiz when "git merge" was run by the user for the first time to make sure she at least read the sections on merges and conflict resolutions in the documentation to understand the fundamentals, and refuse to proceed until the user passes?

I personally do not see a good way out. Even telling new users not to do merges, rebases, or resets but to only build a straight linear history is not a fix, as the user will never gain the necessary understanding by doing only limited and simple things.

Previous: Phil Hord
Message 5 of 5 in “merging confusion and question”
  1. Rich PixleyAug 8, 2012
  2. Junio C HamanoAug 8, 2012
  3. Rich PixleyAug 8, 2012
  4. Phil HordAug 10, 2012
  5. Junio C HamanoAug 10, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.