diff --git a/bin/pdev b/bin/pdev index 1c247cd..0e61e07 100755 --- a/bin/pdev +++ b/bin/pdev @@ -137,8 +137,13 @@ merge) ;; esac git_ensure_cleancheckout - ensure_branches - merge_action "$@" + if ! array_contains LocalBranches "$SrcBranch"; then + # si la branche source n'existe pas, la créer + exec "$MYDIR/pman" "$FEATURE${SrcBranch#$FEATURE}" + else + ensure_branches + merge_action "$@" + fi ;; *) die "$action: action non implémentée"