git flow sync faeture

## Sync feature wiht develop

# Rebase

$ git checkout feature/<feature>
$ git checkout feature/<feature> -b feature/<feature>-tmp
$ git checkout -

# Preserve merges and set commiter date to author date
# see: http://stackoverflow.com/a/2976598/915034
$ git rebase develop --preserve-merges --committer-date-is-author-date

# Resolve Conflict in rebase
- manually resolve
$ git rebase --continue
$ git rebase --skip

## will fail 
## $ git push origin feature/<feature> 

## Publish feature
$ git push origin --delete feature/<feature>
$ git push origin feature/<feature>