-
Notifications
You must be signed in to change notification settings - Fork 2
Update Git workflow #9
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
pmodin
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also, s/jira/JIRA/gi
Good thing you went through this document, let's discuss further.
process/merge_requests/README.md
Outdated
| **Title and Description guidelines** section. | ||
| Set no label, this will be done by someone else. | ||
| Set no assignee, unless you've been asked to. | ||
| 9. Set label "Ready for review". |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is on a per project basis. The projects I mostly work in, for example, we consider all MRs as ready for review unless labeled as WIP.
process/merge_requests/README.md
Outdated
| Set no label, this will be done by someone else. | ||
| Set no assignee, unless you've been asked to. | ||
| 9. Set label "Ready for review". | ||
| 10. Assign it to another developer. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is also on a per project basis
process/merge_requests/README.md
Outdated
| ### Closing a merge request | ||
| When the reviewer considers the code ready to merge, he'll say so, and a label | ||
| with the name `ready-to-merge` will be applied, indicating that the branch is | ||
| with the name `Ready for release` will be applied, indicating that the branch is |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is also a per-project convention, nowadays. Good find.
|
I think that at this point we need to split the documentation per project, keeping the common procedures in these documents. |
|
Agreed, let's have a workshop 😃 |
|
why am i still able to comment here??? remove me. |
|
While removing Markus, you could also remove me as well. |
style/git/README.md
Outdated
|
|
||
| ## Branches | ||
| 1. Branch `master` contains the latest stable release | ||
| 1. Branch `next` contains the latest stable release |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
still master branch for deployment
Master is no longer the main branch and branches are never deleted
References to Jira, new labels, and new branch to be used.
|
@pmodin it would be nice to close this PR at the latest by May 1st since later I might not have access to this repo anymore 😸 |
Several things have changed in the last 10 months:
next