anchor.diff:  ----
   
   [[contributing-workflow]]
  -=== Contribution workflow
  -
  -==== Creating patches
  +== Contribution workflow
  +
  +=== Creating patches
   
   You should use the following workflow, if you plan to contribute
   patches or new features to Tamaya.
  
positive.code: Merge branch 'master' of http://git-wip-us.apache.org/tamaya into master
  ----
  
  ==== Use git pull --rebase
  
  An easy version for getting rid of the auto-merges is using
  
  
negative.code: are unmergeable files around. Cleaning this up with a forced manual
  rebase is not something we would recommend for a git beginner.
  
  === Working in an own branch
  
  This is actually the suggested way to prevent auto-merges. Create an own
  branch where you do your feature work. Either do all your work in one
  