http://radity.com/blog/detail/why-am-i-use-rebase-instead-merge-git/

git_1.txt

gokmen@rodosto ~ % mkdir example_project
gokmen@rodosto ~ % cd example_project
gokmen@rodosto example_project % git init && git flow init -d
[...]
gokmen@rodosto example_project % touch test && git add test && git commit -m "test commit"
[develop d2cd9c5] test commit
 0 files changed
 create mode 100644 test

git_2.txt

gokmen@rodosto example_project % git flow feature start update-test-file
[...]
gokmen@rodosto example_project % git branch
  develop
* feature/update-test-file
  master
gokmen@rodosto example_project % echo "this is test." >> test
gokmen@rodosto example_project % git commit -am "update test file on feature branch."
[feature/update-test-file 2eba55e] update test file on feature branch.
 1 file changed, 1 insertion(+)
gokmen@rodosto example_project % git co develop
gokmen@rodosto example_project % echo "this is really test.." >> test
gokmen@rodosto example_project % git commit -am "update test file on develop branch"
[develop 4dbfd90] update test file on develop branch
 1 file changed, 1 insertion(+)

git_3.txt

gokmen@rodosto example_project % git checkout feature/update-test-file
Switched to branch 'feature/update-test-file'
gokmen@rodosto example_project % git merge develop
Auto-merging test
CONFLICT (content): Merge conflict in test
Automatic merge failed; fix conflicts and then commit the result.
gokmen@rodosto example_project % git st
UU test
gokmen@rodosto example_project % git diff
diff --cc test
index 9cddd74,70d1103..0000000
--- a/test
+++ b/test
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +this is test.
++=======
+ this is really test..
++>>>>>>> develop
gokmen@rodosto example_project % vim test # and i fix conflict and save file.
gokmen@rodosto example_project % git add . && git commit -m "fix conflict"
[feature/update-test-file 11f3b97] fix conflict

git_4.txt

gokmen@rodosto exmaple_project % git flow feature rebase
Will try to rebase 'update-test-file'...
First, rewinding head to replay your work on top of it...
Applying: update test file on feature branch.
Using index info to reconstruct a base tree...
M     test
Falling back to patching base and 3-way merge...
Auto-merging test
CONFLICT (content): Merge conflict in test
Failed to merge in the changes.
Patch failed at 0001 update test file on feature branch.
The copy of the patch that failed is found in:
   /Users/gokmen/exmaple_project/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

git_5.txt

gokmen@rodosto exmaple_project % vim test  # i fix conflict but it won't be a new commit.
gokmen@rodosto exmaple_project % git add .
gokmen@rodosto exmaple_project % git rebase --continue
Applying: update test file on feature branch.

git_6.txt

*   6760a0d (HEAD, develop) Merge branch 'feature/update-test-file' into develop
|\
| *   11f3b97 (feature/update-test-file) fix conflict
| |\
| |/
|/|
* | 4dbfd90 update test file on develop branch
| * 2eba55e update test file on feature branch.
|/
* 08ec218 test commit
* d88b49a (master) Initial commit

git_7.txt

*   c8eb223 (HEAD, develop) Merge branch 'feature/update-test-file' into develop
|\
| * 7cc45f1 (feature/update-test-file) update test file on feature branch.
|/
* 4dbfd90 update test file on develop branch
* 08ec218 test commit
* d88b49a (master) Initial commit