... | ... | @@ -11,19 +11,18 @@ The basic branches are: |
|
|
Using feature branches in git is very easy.
|
|
|
|
|
|
1. Open a ticket that describes the changes to be made to the code.
|
|
|
![Screen_Shot_2016-10-31_at_2.27.13_PM](/uploads/b54a14b59800ddc7cf3ee07ade79cd34/Screen_Shot_2016-10-31_at_2.27.13_PM.png)
|
|
|
|
|
|
![Screen_Shot_2016-10-31_at_2.27.13_PM](/uploads/c420a5725e32df9e11384013478fecf5/Screen_Shot_2016-10-31_at_2.27.13_PM.png)
|
|
|
2. Pull to update your local copy of Experimental, then make a new branch with the naming syntax of Username-Issue-Description.
|
|
|
![Screen_Shot_2016-10-31_at_2.28.15_PM](/uploads/fdb7b992e2c7f051005fe4e3dd48b22c/Screen_Shot_2016-10-31_at_2.28.15_PM.png)
|
|
|
![Screen_Shot_2016-10-31_at_2.28.15_PM](/uploads/5a3f75b9625537563fe601fa0ce09148/Screen_Shot_2016-10-31_at_2.28.15_PM.png)
|
|
|
3. Edit code in the feature branch, committing and pushing like normal.
|
|
|
![Screen_Shot_2016-10-31_at_2.30.54_PM](/uploads/b54d55f05c81586c7fb6308560fd0cc9/Screen_Shot_2016-10-31_at_2.30.54_PM.png)
|
|
|
![Screen_Shot_2016-10-31_at_2.30.54_PM](/uploads/380d9382f7354f4ae20d2c7dd96e00ae/Screen_Shot_2016-10-31_at_2.30.54_PM.png)
|
|
|
4. When you are satisfied with your changes, submit a merge request that references the issue ticket. (Gitlab makes this easy to do with issue number auto-complete.)
|
|
|
|
|
|
*Opening a merge request*
|
|
|
![Screen_Shot_2016-10-31_at_2.32.45_PM](/uploads/de24cf6df3908167935feb3cdaa16017/Screen_Shot_2016-10-31_at_2.32.45_PM.png)
|
|
|
![Screen_Shot_2016-10-31_at_2.32.45_PM](/uploads/0d088010412c7d2bb812c4fb330df4e2/Screen_Shot_2016-10-31_at_2.32.45_PM.png)
|
|
|
*Filling in merge request info*
|
|
|
![Screen_Shot_2016-10-31_at_2.54.44_PM](/uploads/bef9531b77abf049beba51ddce2378e4/Screen_Shot_2016-10-31_at_2.54.44_PM.png)
|
|
|
![Screen_Shot_2016-10-31_at_2.54.44_PM](/uploads/db18526769e858d13a6632173081c089/Screen_Shot_2016-10-31_at_2.54.44_PM.png)
|
|
|
5. Once the request is accepted, update the ticket with the git commit that the changes landed in if Gitlab didn’t associate them automatically.
|
|
|
![Screen_Shot_2016-10-31_at_3.33.13_PM](/uploads/569fce0d37e306bc81af84601f9797cd/Screen_Shot_2016-10-31_at_3.33.13_PM.png)
|
|
|
![Screen_Shot_2016-10-31_at_3.55.02_PM](/uploads/8a8f6f36b409da89938ef436e874d68b/Screen_Shot_2016-10-31_at_3.55.02_PM.png)
|
|
|
![Screen_Shot_2016-10-31_at_3-1.33.13_PM](/uploads/1473e0b11160b31b300f3aae5887eb3c/Screen_Shot_2016-10-31_at_3-1.33.13_PM.png)
|
|
|
![Screen_Shot_2016-10-31_at_3.55.02_PM](/uploads/e0d342b247e0da44e7d3cf68093b8a5e/Screen_Shot_2016-10-31_at_3.55.02_PM.png)
|
|
|
6. Delete the feature branch if it wasn’t automated in the merge accept. |
|
|
\ No newline at end of file |