opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity Actions

Run prettier on all *.md files

Browse source 
```
prettier '{app,source}/**/**.md' --write
```
This commit is contained in:
Oliver Davies 2020-03-08 17:52:59 +00:00
parent a3ceeaf0f3
commit 85a10c545b
170 changed files with 5127 additions and 2282 deletions
Download patch file Download diff file Expand all files Collapse all files

33
source/_posts/what-git-flow.md
View file

@ -1,7 +1,8 @@
---
title: 'DrupalCamp London: What is Git Flow?'
date: 2014-03-03
excerpt: Here are my slides from my "What is Git Flow?" session at DrupalCamp London.
excerpt:
Here are my slides from my "What is Git Flow?" session at DrupalCamp London.
tags:
- git
- git-flow
@ -9,7 +10,9 @@ tags:
- talks
tweets: true
---
Here are my slides from my "What is Git Flow?" session at [DrupalCamp London](http://2014.drupalcamplondon.co.uk).
Here are my slides from my "What is Git Flow?" session at
[DrupalCamp London](http://2014.drupalcamplondon.co.uk).
{% include 'speakerdeck' with { data_id: '201559e0f103013198dd5a5f6f23ab67' } %}
@ -17,16 +20,28 @@ Here are my slides from my "What is Git Flow?" session at [DrupalCamp London](ht
The main take aways are:
* Git Flow adds various commands into Git to enhance its native functionality, which creates a branching model to separate your stable production code from your unstable development code.
* Never commit directly to the master branch - this is for production code only!
* You can commit directly to the develop branch, but this should be done sparingly.
* Use feature branches as much as possible - one per feature, user story or bug.
* Commit early and often, and push to a remote often to encourage collaboration as well as to provide a backup of your code.
* You can use settings within services like GitHub and Bitbucket to only allow certain users to push to the master and develop branches, and restrict other Developers to only commit and push to feature branches. Changes can then be committed and pushed, then reviewed as part of a peer code review, and merged back into the develop branch.
- Git Flow adds various commands into Git to enhance its native functionality,
which creates a branching model to separate your stable production code from
your unstable development code.
- Never commit directly to the master branch - this is for production code only!
- You can commit directly to the develop branch, but this should be done
sparingly.
- Use feature branches as much as possible - one per feature, user story or bug.
- Commit early and often, and push to a remote often to encourage collaboration
as well as to provide a backup of your code.
- You can use settings within services like GitHub and Bitbucket to only allow
certain users to push to the master and develop branches, and restrict other
Developers to only commit and push to feature branches. Changes can then be
committed and pushed, then reviewed as part of a peer code review, and merged
back into the develop branch.
## Feedback
If you've got any questions, please feel free to <a href="http://twitter.com/opdavies" title="My Twitter account">tweet at me</a> or fill in the <a href="http://2014.drupalcamplondon.co.uk/node/add/session-evaluation?nid=86&destination=node/86" title="The session evaluation form to submit feedback">session evaluation form</a> that you can complete on the DrupalCamp London website.
If you've got any questions, please feel free to
<a href="http://twitter.com/opdavies" title="My Twitter account">tweet at me</a>
or fill in the
<a href="http://2014.drupalcamplondon.co.uk/node/add/session-evaluation?nid=86&destination=node/86" title="The session evaluation form to submit feedback">session
evaluation form</a> that you can complete on the DrupalCamp London website.
I've had some great feedback via Twitter: