Feature/pull if not equal #253

Open
wants to merge 2 commits into
from

Projects

None yet

1 participant

@childnode

New feature finish option -p

This will first pull changes on development then merge your feature

qnd but works like a charm for me ;)

cause / explanation: http://stackoverflow.com/questions/10197188/git-flow-branches-have-diverged

@childnode

else should not force

@childnode

This might not work on all environments! Didn't digged into, if there is a git-flow function for that?!

@childnode

rough copy of the require_branches_equal()

  • no reuse
  • code duplication
  • qnd
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment