Skip to content

GitLab

gitlab issues workflow · Changes

Page history
rcabral created page: phpstorm-git-flow authored by Mike McLin's avatar Mike McLin
Show whitespace changes
Inline Side-by-side
gitlab-issues-workflow.markdown
View page @ 4597d760
......@@ -62,8 +62,6 @@ This assumes that you have already installed the [PhpStorm Gitflow](phpstorm-git
1. Whenever development for this issue occurs, make sure you have the branch that was created for this issue checked out
2. All commits should reference the issue. Do this by placing a `#{ISSUE ID}` somewhere in the commit message - e.g. `#4: Add start() event listener that kills overlay`.
* You can also close a ticket via the commit message by starting your commit message with: `Fixes #{ISSUE ID}` or `Closes #{ISSUE ID}` - e.g. `Fixes #4: Add start() event listener that kills overlay`
* **NOTE**: You will not see these commit messages in the Issue comments until your branch has been merged into the **master**.
3. Push the branch to Gitlab (origin) using the same name for the remote branch as the local branch that was created for the issue.
4. Repeat until issue is resolved.
5. Pull from `origin/master` and merge into your local issue branch and then push the issue branch one more time to the origin (Gitlab) before moving on to "creating a merge request" step.
......