On 06/12/2013 07:09 PM, Christopher wrote:
I did read the whole thing. I would like to see a place for the
scenarios I contributed, but other than that, I think it's a
sufficient plan for transition.
Are you planning to update it yourself or would you like me to? If you'd
like me to, please refresh my mind on the specifics :)
Specifically, the scenarios in the suggestions file I attached to ACCUMULO-1498:
https://issues.apache.org/jira/secure/attachment/12586445/ctubbsii-git-suggestions.v1.txt
I'd prefer you do it, just so a second pair of eyes can take a look
and verify that the scenarios I describe match what you've already
documented. Keep in mind that the example scenarios might grow (such
as the scenario Mike Drob described above, and I'm sure there will be
more we'll encounter and want to document as we make mistakes)... I
don't know if that warrants a separate page, or just a dedicated
section for "scenarios".
Added the first two situations to the bottom in a new header "Examples".
Added the third to the feature-branches discussion under
implementation>developers. I did change a few things from your txt file;
please verify.
Also tweaked an example to document usage of things like `git merge
--squash` and `git merge --no-commit`, re: Drew's comments.
Two last things I noticed in this go-around:
1. Link to Christopher's Maven instructions. Not critical -- we don't
them in CMS now anyways, so nothing gained, nothing lost.
2. Subject of notification emails. See
https://git-wip-us.apache.org/docs/switching-to-git.html#contents for
details:
I was thinking the following would be nice:
[%(repo_name)s]: %(shash)s - %(subject)s
e.g.
"ACCUMULO: 1a2b34 - ACCUMULO-12345 I fixed the bug!"
Copied again for your convenience:
http://people.apache.org/~elserj/git/git.html
- Josh
