Skip to content

Commit 62426bf

Browse files
committed
releasing first feature example
1 parent f9687c1 commit 62426bf

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

README.markdown

+14-4
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,21 @@ If we push a feature branch to GitHub without releasing it(`git push origin feat
9999

100100
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.
101101

102+
➜ Git-Flow-Example git:(feature/feature_example) git flow feature finish feature_example
103+
Switched to branch 'develop'
104+
Merge made by recursive.
105+
README.markdown | 56 +++++++++++++++++++++++++++++++++++++++++
106+
images/network-newfeature.png | Bin 0 -> 14738 bytes
107+
2 files changed, 56 insertions(+), 0 deletions(-)
108+
create mode 100644 images/network-newfeature.png
109+
Deleted branch feature/feature_example (was 5b99b47).
102110

111+
Summary of actions:
112+
- The feature branch 'feature/feature_example' was merged into 'develop'
113+
- Feature branch 'feature/feature_example' has been removed
114+
- You are now on branch 'develop'
103115

116+
Once the develop branch is pushed to GitHub, network graph looks like this:
104117

105-
Once that happens, the network looks like this:
106-
107-
108-
You can see the green dots are the individual commits on this branch.
118+
![network-after-feature-merge](http://github.com/eadz/Git-Flow-Example/raw/develop/images/network-after-feature-merge.png "After pushing merging")
109119

14.9 KB
Loading

0 commit comments

Comments
 (0)