Hi, - Using multiple git identities (https://uima.apache.org/git-svn-notes.html) - Having had the conversation with you on this, I kind of get what you mean, but I think for any other reader, it may be quite cryptic what you mean by "use the local git configuration for the repo to specify this".
- https://uima.apache.org/git-conventions.html - The page gives high level information, but doesn't really say what OUR conventions are; having common conventions across all UIMA subproject would seem reasonable to me - Here is an (certainly also imperfect) example providing a bit more info on actual conventions for another project I work on [1] - https://uima.apache.org/git-work-process.html - Nice :) - I think it would be good to mention here the format for commit messages we expect - Also, adding the requirement to open a Jira issue would be useful, maybe in "make a branch" or even before - https://uima.apache.org/git-release-notes.html - Once the vote passes, retag the last rc with the rel/tag-name (see below). -> so what do you enter during the release when Maven asks for the tag? I would leave the default (i.e. not add "-rc-X") as we eventually started doing with subversion. But the text "retag last rc" might be read to imply that RCs should have "rc" in the tag... - If branched, merge the release branch back into the master - Master is protected, we cannot directly commit/merge to it; but the text doesn't mention that all of the release stuff essentially needs to happen in a PR (unless we change the protection scheme) - (needs confirmation) the tag is checked out into a new branch, ... - I have not seen an actual new branch being created. What actually seems to happen is that the Maven release plugin clones the tag to "target/checkout" - no branches being created or deleted - How to roll back a release attempt - I usually just delete the tag and re-run the release process without resetting the branch/PR. I don't think your "git push" after the reset would work since you have rewritten history. I'm pretty sure it'd need to be a "force" push. Cheers, -- Richard [1] https://inception-project.github.io//releases/0.12.2/docs/developer-guide.html#_source_code_management > On 30. Oct 2019, at 15:59, Marshall Schor <[email protected]> wrote: > > The GIT ref on the left hand nav bar points to some new topics around projects > in GIT. > > Please review, and fix, or discuss :-) > > -Marshall >
