From: James Pickens <jepicken@gmail.com>
To: Peter Harris <git@peter.is-a-geek.org>
Cc: Git ML <git@vger.kernel.org>
Subject: Re: Disallow amending published commits?
Date: Sat, 21 Mar 2009 21:09:43 -0700 [thread overview]
Message-ID: <885649360903212109v316f441fvea3f498e91c0059e@mail.gmail.com> (raw)
In-Reply-To: <eaa105840903211853p65327ffdvebbe28da5f256871@mail.gmail.com>
On Sat, Mar 21, 2009, Peter Harris <git@peter.is-a-geek.org> wrote:
> Okay. So in that workflow, you won't ever lose the original history.
>
> If someone creates an alternate history that differs only slightly,
> odds are your continuous integration server will get a merge conflict.
> Presumably it will reject the pull request at that point.
>
> If it doesn't conflict, you'll have both alternate histories. So
> nothing is lost.
>
> Maybe I'm misunderstanding the question? (That is definitely possible.
> The idea that a person would go to the effort of rewriting history -
> especially when that person knows the original history would stay put
> - often enough to cause problems is like suggesting that a person
> might write log messages in latin. I'm having a hard time envisioning
> the need to write down a social rule about it, much less the need to
> write an AI to try to detect it.)
I think you understood the question perfectly, and your comments all make
sense. Perhaps I'm just being paranoid and this won't be a problem at all.
A bit of background might help explain my paranoia: I'm about to pilot Git
on a fairly large project, where none of the users have Git experience, and
many of them don't have much experience with any other version control
system either. I had to fight hard to get this pilot approved, and a lot
of people will be watching to see how it goes, so I'm trying to do anything
I can to make sure it will be successful.
James
next prev parent reply other threads:[~2009-03-22 4:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-21 17:56 Disallow amending published commits? James Pickens
2009-03-21 18:46 ` Peter Harris
2009-03-21 22:49 ` James Pickens
2009-03-22 1:53 ` Peter Harris
2009-03-22 2:57 ` Peter Harris
2009-03-22 4:09 ` James Pickens [this message]
2009-03-22 14:19 ` Peter Harris
2009-03-22 15:15 ` Nicolas Sebrecht
2009-03-22 2:42 ` Jeff King
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=885649360903212109v316f441fvea3f498e91c0059e@mail.gmail.com \
--to=jepicken@gmail.com \
--cc=git@peter.is-a-geek.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).