From d3373f183b2886d5814da41c01b1429f585f93d4 Mon Sep 17 00:00:00 2001 From: Eadz Date: Thu, 2 Sep 2010 15:00:44 +1200 Subject: [PATCH 1/7] adding images --- README.markdown | 37 ++++++++++++++++++++++ images/network-after-push-development.png | Bin 0 -> 16967 bytes images/network-after-push-master.png | Bin 0 -> 16475 bytes 3 files changed, 37 insertions(+) create mode 100644 images/network-after-push-development.png create mode 100644 images/network-after-push-master.png diff --git a/README.markdown b/README.markdown index c08c018..dbdcca7 100644 --- a/README.markdown +++ b/README.markdown @@ -117,3 +117,40 @@ Once the develop branch is pushed to GitHub, network graph looks like this: ![network-after-feature-merge](http://github.com/eadz/Git-Flow-Example/raw/develop/images/network-after-feature-merge.png "After pushing merging") + +Now it's time for another release + + ➜ Git-Flow-Example git:(release/v0.2) git flow release finish v0.2 + Switched to branch 'master' + Merge made by recursive. + README.markdown | 66 ++++++++++++++++++++++++++++++++ + images/network-after-feature-merge.png | Bin 0 -> 15281 bytes + images/network-newfeature.png | Bin 0 -> 14738 bytes + 3 files changed, 66 insertions(+), 0 deletions(-) + create mode 100644 images/network-after-feature-merge.png + create mode 100644 images/network-newfeature.png + Switched to branch 'develop' + Merge made by recursive. + README.markdown | 18 ++++++++++++++---- + images/network-after-feature-merge.png | Bin 0 -> 15281 bytes + 2 files changed, 14 insertions(+), 4 deletions(-) + create mode 100644 images/network-after-feature-merge.png + Deleted branch release/v0.2 (was 62426bf). + + Summary of actions: + - Latest objects have been fetched from 'origin' + - Release branch has been merged into 'master' + - The release was tagged 'v0.2' + - Release branch has been back-merged into 'develop' + - Release branch 'release/v0.2' has been deleted + +Note in the above description of what happened - Release branch has been merged into 'master' and Release branch has been back-merged into 'develop' + +If we want others to have access to the release on GitHub, we need to push both master and develop branches. + +After pushing the develop branch with `git push origin develop` : +![network-after-push-development](http://github.com/eadz/Git-Flow-Example/raw/develop/images/network-after-push-development.png) +After pushing the master branch with `git push origin master` : +![network-after-push-master](http://github.com/eadz/Git-Flow-Example/raw/develop/images/network-after-push-master.png) + + diff --git a/images/network-after-push-development.png b/images/network-after-push-development.png new file mode 100644 index 0000000000000000000000000000000000000000..f649abdbdac59c1d40295d2fe25d1198000188f4 GIT binary patch literal 16967 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 literal 0 HcmV?d00001 diff --git a/images/network-after-push-master.png b/images/network-after-push-master.png new file mode 100644 index 0000000000000000000000000000000000000000..0dfc09493e9fd8c6308248fcf9c86cc32116049b GIT binary patch literal 16475 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 r7-9fP0Z}H#`1J#Z|9?04j&9()S Date: Thu, 2 Sep 2010 15:06:41 +1200 Subject: [PATCH 2/7] added resources and copyright --- README.markdown | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.markdown b/README.markdown index dbdcca7..22f4501 100644 --- a/README.markdown +++ b/README.markdown @@ -154,3 +154,10 @@ After pushing the master branch with `git push origin master` : ![network-after-push-master](http://github.com/eadz/Git-Flow-Example/raw/develop/images/network-after-push-master.png) +## Further Resources ## + +[A successful Git branching model](http://nvie.com/git-model) +[Git Flow](http://github.com/nvie/gitflow) + + +This tutorial was created by [Eaden McKee](http://www.eadz.co.nz/) and licensed [Creative Commons by-nc-sa](http://creativecommons.org/licenses/by-nc-sa/3.0/nz/) ## \ No newline at end of file From 37fcbd107c10ad14f7956e567b26f52a8be88604 Mon Sep 17 00:00:00 2001 From: Eadz Date: Thu, 2 Sep 2010 15:12:48 +1200 Subject: [PATCH 3/7] image changes --- README.markdown | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.markdown b/README.markdown index 22f4501..d3d86ca 100644 --- a/README.markdown +++ b/README.markdown @@ -149,15 +149,18 @@ Note in the above description of what happened - Release branch has been merged If we want others to have access to the release on GitHub, we need to push both master and develop branches. After pushing the develop branch with `git push origin develop` : + ![network-after-push-development](http://github.com/eadz/Git-Flow-Example/raw/develop/images/network-after-push-development.png) + After pushing the master branch with `git push origin master` : + ![network-after-push-master](http://github.com/eadz/Git-Flow-Example/raw/develop/images/network-after-push-master.png) ## Further Resources ## -[A successful Git branching model](http://nvie.com/git-model) -[Git Flow](http://github.com/nvie/gitflow) +*[A successful Git branching model](http://nvie.com/git-model) +*[Git Flow](http://github.com/nvie/gitflow) -This tutorial was created by [Eaden McKee](http://www.eadz.co.nz/) and licensed [Creative Commons by-nc-sa](http://creativecommons.org/licenses/by-nc-sa/3.0/nz/) ## \ No newline at end of file +This tutorial was created by [Eaden McKee](http://www.eadz.co.nz/) and licensed [Creative Commons by-nc-sa](http://creativecommons.org/licenses/by-nc-sa/3.0/nz/) \ No newline at end of file From e0eb45c96813644d8eb19d630c77c315075639b5 Mon Sep 17 00:00:00 2001 From: Denis Novikov Date: Wed, 3 May 2017 19:59:47 +0300 Subject: [PATCH 4/7] Create gitignore list --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c411f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +# IDE Configs +.idea \ No newline at end of file From 3862af3d5542f2cd0add140225a1003c9d551c4d Mon Sep 17 00:00:00 2001 From: Denis Novikov Date: Wed, 3 May 2017 20:00:39 +0300 Subject: [PATCH 5/7] Updated file extension --- README.markdown => README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README.markdown => README.md (100%) diff --git a/README.markdown b/README.md similarity index 100% rename from README.markdown rename to README.md From 9413ccd0427c16103a98cf5adbb4108bfb49f857 Mon Sep 17 00:00:00 2001 From: Denis Novikov Date: Wed, 3 May 2017 20:36:20 +0300 Subject: [PATCH 6/7] Update readme --- README.md | 231 +++++++++++++++++++++++++++--------------------------- 1 file changed, 116 insertions(+), 115 deletions(-) diff --git a/README.md b/README.md index d3d86ca..3741e80 100644 --- a/README.md +++ b/README.md @@ -1,166 +1,167 @@ -# Git Flow by example using GitHub # +# Git Flow by example using GitHub -## Initial Setup ## +## Initial Setup We start with this -![network-1](http://github.com/eadz/Git-Flow-Example/raw/develop/images/network-1.png "Initial Commit Network Image") +![network-1](images/network-1.png "Initial Commit Network Image") - ➜ Git-Flow-Example git:(master) git flow init +```bash +➜ Git-Flow-Example git:(master) git flow init - Which branch should be used for bringing forth production releases? - - master - Branch name for production releases: [master] - Branch name for "next release" development: [develop] +No branches exist yet. Base branches must be created now. +Branch name for production releases: [master] +Branch name for "next release" development: [develop] - How to name your supporting branch prefixes? - Feature branches? [feature/] - Release branches? [release/] - Hotfix branches? [hotfix/] - Support branches? [support/] - Version tag prefix? [] - -Then after pushing the develop branch to github, we get this: +How to name your supporting branch prefixes? +Feature branches? [feature/] +Bugfix branches? [bugfix/] +Release branches? [release/] +Hotfix branches? [hotfix/] +Support branches? [support/] +Version tag prefix? [] +``` -![network-2](http://github.com/eadz/Git-Flow-Example/raw/develop/images/network-2.png "After git flow init") +Then after pushing the develop branch to github, we get this: -## Releasing The Development Version ## +![network-2](images/network-2.png "After git flow init") -### Release branches ### -**May branch off from:** develop -**Must merge back into:** develop and master -**Branch naming convention:** release-* +## Release branches -So far, we have been working on the development version. -Even though this post isn't production ready, I'm going to make a release branch using git flow. +* **May branch off from:** develop +* **Must merge back into:** develop and master +* **Branch naming convention:** release-* - ➜ Git-Flow-Example git:(develop) git flow release start v0.1 - Switched to a new branch 'release/v0.1' +So far, we have been working on the development version. +Even though this post isn't production ready, I'm going to make a release branch using git flow. - Summary of actions: - - A new branch 'release/v0.1' was created, based on 'develop' - - You are now on branch 'release/v0.1' +```bash +➜ Git-Flow-Example git:(develop) git flow release start v0.1 +Switched to a new branch 'release/v0.1' - Follow-up actions: - - Bump the version number now! - - Start committing last-minute fixes in preparing your release - - When done, run: +Summary of actions: +- A new branch 'release/v0.1' was created, based on 'develop' +- You are now on branch 'release/v0.1' - git flow release finish 'v0.1' +Follow-up actions: +- Bump the version number now! +- Start committing last-minute fixes in preparing your release +- When done, run: -When creating a release branch, it uses the current state of 'develop' branch as its base. You can make any further small commits to make it production ready, then you can run `git flow release finish 'v0.1'` to finish the release. + git flow release finish 'v0.1' +``` -When the release is finished, the release branch will be merged to master. +When creating a release branch, it uses the current state of 'develop' branch as its base. You can make any further small commits to make it production ready, then you can run `git flow release finish 'v0.1'` to finish the release. +When the release is finished, the release branch will be merged to master. -## Git flow feature example ## +## Feature branches -### Release branches ### -**May branch off from:** develop -**Must merge back into:** develop and master -**Branch naming convention:** release-* +* **May branch off from:** develop +* **Must merge back into:** develop +* **Branch naming convention:** feature/feature_name -### Feature branches ### -**May branch off from:** develop -**Must merge back into:** develop -**Branch naming convention:** feature/feature_name +Feature branches are where you'll do most of your work. This chapter is a feature branch. You make your changes, and commit to the branch, and when the branch is ready, it will be merged back into develop. -Feature branches are where you'll do most of your work. This chapter is a feature branch. You make your changes, and commit to the branch, and when the branch is ready, it will be merged back into develop. +```bash +➜ Git-Flow-Example git:(develop) git flow feature start feature_example +Switched to a new branch 'feature/feature_example' - ➜ Git-Flow-Example git:(feature/feature_example) ✗ git flow feature help - Branches 'develop' and 'origin/develop' have diverged. - And local branch 'develop' is ahead of 'origin/develop'. - Switched to a new branch 'feature/feature_example' +Summary of actions: +- A new branch 'feature/feature_example' was created, based on 'develop' +- You are now on branch 'feature/feature_example' - Summary of actions: - - A new branch 'feature/feature_example' was created, based on 'develop' - - You are now on branch 'feature/feature_example' +Now, start committing on your feature. When done, use: - Now, start committing on your feature. When done, use: + git flow feature finish feature_example - git flow feature finish feature_example +``` There are quite a few options for git flow feature. You can find them buy running `git flow feature help`: - git flow feature help - usage: git flow feature [list] [-v] - git flow feature start [-F] [] - git flow feature finish [-rF] - git flow feature publish - git flow feature track - git flow feature diff [] - git flow feature rebase [-i] [] - git flow feature checkout [] - git flow feature pull [] +```bash +git flow feature help +usage: git flow feature [list] [-v] + git flow feature start [-F] [] + git flow feature finish [-rF] + git flow feature publish + git flow feature track + git flow feature diff [] + git flow feature rebase [-i] [] + git flow feature checkout [] + git flow feature pull [] +``` If we push a feature branch to GitHub without releasing it(`git push origin feature/feature_example`), the network graph looks like this: -![network-newfeature](http://github.com/eadz/Git-Flow-Example/raw/develop/images/network-newfeature.png "After pushing feature branch") +![network-newfeature](images/network-newfeature.png "After pushing feature branch") Once we release the feature by running `git flow feature finish feature_example`, the changes on the feature branch are merged back into the **develop** branch, but not the master branch. - ➜ Git-Flow-Example git:(feature/feature_example) git flow feature finish feature_example - Switched to branch 'develop' - Merge made by recursive. - README.markdown | 56 +++++++++++++++++++++++++++++++++++++++++ - images/network-newfeature.png | Bin 0 -> 14738 bytes - 2 files changed, 56 insertions(+), 0 deletions(-) - create mode 100644 images/network-newfeature.png - Deleted branch feature/feature_example (was 5b99b47). - - Summary of actions: - - The feature branch 'feature/feature_example' was merged into 'develop' - - Feature branch 'feature/feature_example' has been removed - - You are now on branch 'develop' +```bash +➜ Git-Flow-Example git:(feature/feature_example) git flow feature finish feature_example +Switched to branch 'develop' +Update 37fcbd1..be88604 +Fast-forward + README.md | 56 +++++++++++++++++++++++++++++++++++++++++ + images/network-newfeature.png | Bin 0 -> 14738 bytes + 2 files changed, 56 insertions(+), 0 deletions(-) + create mode 100644 images/network-newfeature.png +Deleted branch feature/feature_example (was be88604). + +Summary of actions: +- The feature branch 'feature/feature_example' was merged into 'develop' +- Feature branch 'feature/feature_example' has been locally deleted +- You are now on branch 'develop' +``` Once the develop branch is pushed to GitHub, network graph looks like this: -![network-after-feature-merge](http://github.com/eadz/Git-Flow-Example/raw/develop/images/network-after-feature-merge.png "After pushing merging") - - -Now it's time for another release - - ➜ Git-Flow-Example git:(release/v0.2) git flow release finish v0.2 - Switched to branch 'master' - Merge made by recursive. - README.markdown | 66 ++++++++++++++++++++++++++++++++ - images/network-after-feature-merge.png | Bin 0 -> 15281 bytes - images/network-newfeature.png | Bin 0 -> 14738 bytes - 3 files changed, 66 insertions(+), 0 deletions(-) - create mode 100644 images/network-after-feature-merge.png - create mode 100644 images/network-newfeature.png - Switched to branch 'develop' - Merge made by recursive. - README.markdown | 18 ++++++++++++++---- - images/network-after-feature-merge.png | Bin 0 -> 15281 bytes - 2 files changed, 14 insertions(+), 4 deletions(-) - create mode 100644 images/network-after-feature-merge.png - Deleted branch release/v0.2 (was 62426bf). - - Summary of actions: - - Latest objects have been fetched from 'origin' - - Release branch has been merged into 'master' - - The release was tagged 'v0.2' - - Release branch has been back-merged into 'develop' - - Release branch 'release/v0.2' has been deleted +![network-after-feature-merge](images/network-after-feature-merge.png "After pushing merging") + +Now it's time for another release + +```bash +➜ Git-Flow-Example git:(release/v0.2) git flow release finish v0.2 +Switched to branch 'master' +Merge made by recursive. + README.markdown | 66 ++++++++++++++++++++++++++++++++ + images/network-after-feature-merge.png | Bin 0 -> 15281 bytes + images/network-newfeature.png | Bin 0 -> 14738 bytes + 3 files changed, 66 insertions(+), 0 deletions(-) + create mode 100644 images/network-after-feature-merge.png + create mode 100644 images/network-newfeature.png +Switched to branch 'develop' +Merge made by recursive. + README.markdown | 18 ++++++++++++++---- + images/network-after-feature-merge.png | Bin 0 -> 15281 bytes + 2 files changed, 14 insertions(+), 4 deletions(-) + create mode 100644 images/network-after-feature-merge.png +Deleted branch release/v0.2 (was 62426bf). + +Summary of actions: +- Latest objects have been fetched from 'origin' +- Release branch has been merged into 'master' +- The release was tagged 'v0.2' +- Release branch has been back-merged into 'develop' +- Release branch 'release/v0.2' has been deleted +``` Note in the above description of what happened - Release branch has been merged into 'master' and Release branch has been back-merged into 'develop' -If we want others to have access to the release on GitHub, we need to push both master and develop branches. +If we want others to have access to the release on GitHub, we need to push both master and develop branches. After pushing the develop branch with `git push origin develop` : -![network-after-push-development](http://github.com/eadz/Git-Flow-Example/raw/develop/images/network-after-push-development.png) +![network-after-push-development](images/network-after-push-development.png) After pushing the master branch with `git push origin master` : -![network-after-push-master](http://github.com/eadz/Git-Flow-Example/raw/develop/images/network-after-push-master.png) - - -## Further Resources ## +![network-after-push-master](images/network-after-push-master.png) -*[A successful Git branching model](http://nvie.com/git-model) -*[Git Flow](http://github.com/nvie/gitflow) +## Further Resources +* [A successful Git branching model](http://nvie.com/git-model) +* [Git Flow](http://github.com/nvie/gitflow) This tutorial was created by [Eaden McKee](http://www.eadz.co.nz/) and licensed [Creative Commons by-nc-sa](http://creativecommons.org/licenses/by-nc-sa/3.0/nz/) \ No newline at end of file From a7d6d06bdc44205e433ceea3bb155103e0a9a4f3 Mon Sep 17 00:00:00 2001 From: Denis Novikov Date: Wed, 3 May 2017 20:56:59 +0300 Subject: [PATCH 7/7] Update readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3741e80..8d42999 100644 --- a/README.md +++ b/README.md @@ -163,5 +163,6 @@ After pushing the master branch with `git push origin master` : * [A successful Git branching model](http://nvie.com/git-model) * [Git Flow](http://github.com/nvie/gitflow) +* [Git Flow Cheatsheet](http://danielkummer.github.io/git-flow-cheatsheet/) | Thanks [Denis Novikov](https://github.com/denisnovikov) This tutorial was created by [Eaden McKee](http://www.eadz.co.nz/) and licensed [Creative Commons by-nc-sa](http://creativecommons.org/licenses/by-nc-sa/3.0/nz/) \ No newline at end of file