Skip to content

GitLab

  • Menu
Projects Groups Snippets
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
  • D digitec-wiki
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
  • Deployments
    • Deployments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
Collapse sidebar
  • Digitec
  • digitec-wiki
  • Wiki
  • gitlab issues workflow

gitlab issues workflow · Changes

Page history
rcabral created page: phpstorm-git-flow authored Feb 17, 2014 by Mike McLin's avatar Mike McLin
Show whitespace changes
Inline Side-by-side
gitlab-issues-workflow.markdown
View page @ d3432156
......@@ -62,6 +62,7 @@ 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`.
* **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.
......@@ -74,7 +75,6 @@ These instructions make use of the **Navigation Bar** at the top of the PhpStorm
* The right-side of the **Status Bar** at the bottom, you should see **Git: {ISSUE BRANCH NAME}**
* If the **{ISSUE BRANCH NAME}** isn't the correct branch created for the issue, then click the branch name to open the branches popup menu. From the **Local Branches** section, choose correct branch and select **checkout**.
2. Commit changes to your local repo by clicking the **Commit Changes** button *(has an icon that says "VCS" with a green upward arrow below it)* located on the right side of the upper **Navigation Bar**. 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. After filling out your commit message, you can choose to Commit and Push, or just Commit. Just note that a **Push** is required either then or later on to have your commits show up on Gitlab.
4. When you do push, within the **Git Push** popup window you'll notice towards the bottom that it will push to the **origin** and use the same branch as your issues branch. Click the **Push** button to push your commits to Gitlab (origin).
......
Clone repository
  • alpha beta testing
  • browser testing
  • camtasia licenses
  • code delivery processes
  • coding practices
  • css and sass coding standards
  • database schema standards
  • dependency management
  • development environments
  • digitec agile process
  • digitec gitlab styles
  • digitec software promises
  • digitec spec process
  • gitlab administration
  • gitlab issues tags
View All Pages