Skip to content

G
gitflow
Commit 51fa95dc authored by Vincent Driessen's avatar Vincent Driessen
Browse files
Options

Only mention (warn) when develop is ahead of origin/develop. This is not harmful in any way.

parent 144bb507
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
gitflow-sh-setup
View file @ 51fa95dc
...@@ -98,7 +98,8 @@ gitflow_require_branches_equal() { ...@@ -98,7 +98,8 @@ gitflow_require_branches_equal() {
if [ $status -eq 1 ]; then if [ $status -eq 1 ]; then
die "And branch '$1' may be fast-forwarded." die "And branch '$1' may be fast-forwarded."
elif [ $status -eq 2 ]; then elif [ $status -eq 2 ]; then
die "And local branch '$1' is ahead of '$2'." # Warn here, since there is no harm in being ahead
warn "And local branch '$1' is ahead of '$2'."
else else
die "Branches need merging first." die "Branches need merging first."
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment