Difference between revisions of "Git & Atlassian"

From Briki
Jump to: navigation, search
(Created page with "* Create JIRA issue * Click "Create Branch" on JIRA issue (check source branch) * <code>git fetch</code> * <code>git checkout branchname</code> (this will automatically create...")
 
Line 1: Line 1:
 +
=== Simple workflow ===
 
* Create JIRA issue
 
* Create JIRA issue
 
* Click "Create Branch" on JIRA issue (check source branch)
 
* Click "Create Branch" on JIRA issue (check source branch)
 +
** This will transition the JIRA issue to In Progress
 
* <code>git fetch</code>
 
* <code>git fetch</code>
 
* <code>git checkout branchname</code> (this will automatically create the new branch locally, based on the new remote branch)
 
* <code>git checkout branchname</code> (this will automatically create the new branch locally, based on the new remote branch)
Line 6: Line 8:
 
* <code>git commit -am "My commit description"</code>
 
* <code>git commit -am "My commit description"</code>
 
* <code>git push</code>
 
* <code>git push</code>
 +
* Create pull request
 +
** This will transition the JIRA issue to In Review
 +
* Merge on build success, and optionally delete branch
 +
** This will transition the JIRA issue to Done
 +
* Delete branch locally if desired, with <code>git branch -d branchname</code>

Revision as of 14:55, 5 December 2014

Simple workflow

  • Create JIRA issue
  • Click "Create Branch" on JIRA issue (check source branch)
    • This will transition the JIRA issue to In Progress
  • git fetch
  • git checkout branchname (this will automatically create the new branch locally, based on the new remote branch)
  • Make changes
  • git commit -am "My commit description"
  • git push
  • Create pull request
    • This will transition the JIRA issue to In Review
  • Merge on build success, and optionally delete branch
    • This will transition the JIRA issue to Done
  • Delete branch locally if desired, with git branch -d branchname