Dear Wiki user, You have subscribed to a wiki page or wiki category on "Httpcomponents Wiki" for change notification.
The "GitGuidelines" page has been changed by MichaelOsipov: https://wiki.apache.org/HttpComponents/GitGuidelines?action=diff&rev1=5&rev2=6 Comment: Replaced master with release branch = Typical Issue Workflow = - 1. Branch off master ({{{git checkout -b <branch>/<JIRA id> master}}}) where {{{<branch>}}} is the branch you are going to apply the fix, e.g., 4.4.x or 5.0.x and {{{<JIRA id>}}} being the JIRA you have assigned to yourself, e.g., HTTPCORE-123 or HTTPCLIENT-689. Thus, {{{git checkout -b 4.4.x/HTTPCORE-123 master}}}. + 1. Branch off a release branch (e.g., 4.4.x, 5.0.x) ({{{git checkout -b <release branch>/<JIRA id> master}}}) where {{{<JIRA id>}}} being the JIRA issue you have assigned to yourself, e.g., HTTPCORE-123 or HTTPCLIENT-689. Exmaple: {{{git checkout -b 4.4.x/HTTPCORE-123 4.4.x}}}. 1. Work on your issue and create as many commits as you want/need 1. Polish it, squash it or fix it up into a single commit 1. Ask for a review if you are uncertain 1. Take care of a proper commit message (good reads: [[https://chris.beams.io/posts/git-commit/|1]] and [[https://github.com/erlang/otp/wiki/Writing-good-commit-messages|2]]: Put the title of the JIRA issue, e.g., [HTTPCORE-123] Memory leak in response, in the first line, followed by an explanation why you did take this approach. The ticket desc contains the issue, your commit message contains the solution. If in doubt, ask for help and give people a couple of days to react. - 1. Request the release manager to merge your banch back to master and make sure that this merge won't incur a merge commit + 1. Request the release manager to merge your banch back to the release branch and make sure that this merge won't incur a merge commit 1. When you close the issue, put a link to your commit to create a direct relation between issue and solution. = Side Notes = --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@hc.apache.org For additional commands, e-mail: dev-h...@hc.apache.org
