title: Git Flow Feature Creation and Rebasing Features
body: <p>I have 2 branches, <strong>development</strong> and <strong>master</strong>. I want to create a new feature on the development branch so I do:</p>
  
  <pre><code>git flow feature start test_01
  </code></pre>
  
  <p>Which creates a feature branch and switches to this branch. For testing reasons I switch to the development branch and edit file read_me.markdown. I commit this change and push it.</p>
  
  <p>I switch back to the feature branch and edit the same read_me.markdown file on the same line to spark a merge conflict. To finish the feature I do:</p>
  
  <pre><code>git flow feature finish test_01 -r (so it rebases the feature branch)
  </code></pre>
  
  <p>Now a conflict occurs I fix it using <strong>vimdiff</strong> with vim-fugitive. I start vimdiff and do <strong>“:ls”</strong> I pick the remote branch to use. Next I do <strong>":diffget 4"</strong> followed by <strong>":diffupdate "</strong> and next I just write the file and quit everything <strong>“:wqa”</strong></p>
  
  <p>Now the conflict is fixed and a merge occurred and I just simply push my changes. </p>
  
  <p><strong>THE PROBLEM:</strong> when doing this I go look at Github for mac tool and see that there are no conflicts and no changes. But when I switch over(checkout) to the master branch and back to the develop branch I get that same merge conflict again? </p>
  
  <p><strong><em>So I’m wondering what is wrong in my way of working.</em></strong></p>
  
  <p>Thanks a lot for the help</p>
  
  <p><strong>UPDATE1)</strong> The Github tool conflict:</p>
  
  <pre><code>Auto-merging README.markdown
  CONFLICT (content): Merge conflict in README.markdown
   (1)
  </code></pre>
  
  <p><strong>UPDATE2)</strong> Tried without rebase same error, no error when checking out the branch only in the Github Tool</p>
  
  <p><strong>UPDATE3)</strong></p>
  
  <p>1) git flow feature start test</p>
  
  <p>2) do changes to develop -> so I can spark a conflict</p>
  
  <p>3) do changes to feature</p>
  
  <p>4) git rebase feature develop</p>
  
  <p>5) Fix changes -> When I want to commit it says “No changes - did you forget to use 'git add’?”</p>
  
  <p>6) git checkout develop</p>
  
  <p>7) git merge feature -> <strong>STILL HAVE Merge Conflict on Develop branch</strong></p>
  
  <p><strong>UPDATE4) More Details</strong></p>
  
  <p>1) I am on a new branch develop</p>
  
  <p>2) git flow init</p>
  
  <p>3) git flow feature start enhancement1  -> Feature branch is created</p>
  
  <p>4) git checkout develop </p>
  
  <p>4.1) in File readme.md I add “testtesttest” and commit my work </p>
  
  <p>4.2) tig status</p>
  
  <p>4.2) I set the file readme.md to “changes to be committed”</p>
  
  <p>4.3) I commit this files</p>
  
  <p>4.4) Committed as “commit on develop branch”</p>
  
  <p>5) git checkout feature/enhancement1</p>
  
  <p>5.1) in File readme.md I add “xxxxxxxxx” and commit my work </p>
  
  <p>5.2) tig status</p>
  
  <p>5.2) I set the file readme.md to “changes to be committed”</p>
  
  <p>5.3) I commit this files</p>
  
  <p>5.4) Committed as “commit on feature branch”</p>
  
  <p>6) git rebase feature/enhancement1 develop</p>
  
  <pre><code>First, rewinding head to replay your work on top of it...
  Applying: Commit on Develop Branch
  Using index info to reconstruct a base tree...
  M   README.md
  Falling back to patching base and 3-way merge...
  Auto-merging README.md
  CONFLICT (content): Merge conflict in README.md
  Failed to merge in the changes.
  Patch failed at 0001 Commit on Develop Branch
  The copy of the patch that failed is found in:
     /Users/Vincent/Documents/featureconflicts/.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".
  </code></pre>
  
  <p>7) I now have a conflict I will fix it setting the file to the condition of 5.1 (in File readme.md I add “xxxxxxxxx” )</p>
  
  <p>8) Fixed the conflict</p>
  
  <p>9) Did git rebase --skip</p>
  
  <p>10) Switches to my develop branch</p>
  
  <p>11) git flow feature finish enhancement</p>
  
  <p>--> Now everything works great. So it was rebase --skip that was needed.</p>