Skip to content

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

Annotated the code with some TODO-notes.

parent 5fa4758e
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
git-flow-hotfix
View file @ d29e315f
...@@ -201,6 +201,8 @@ cmd_finish() { ...@@ -201,6 +201,8 @@ cmd_finish() {
git checkout $DEVELOP_BRANCH || \ git checkout $DEVELOP_BRANCH || \
die "Could not check out $DEVELOP_BRANCH." die "Could not check out $DEVELOP_BRANCH."
# TODO: Actually, accounting for 'git describe' pays, so we should
# ideally git merge --no-ff $tagname here, instead!
git merge --no-ff $BRANCH || \ git merge --no-ff $BRANCH || \
die "There were merge conflicts." die "There were merge conflicts."
# TODO: What do we do now? # TODO: What do we do now?
......
git-flow-release
View file @ d29e315f
...@@ -206,6 +206,9 @@ cmd_finish() { ...@@ -206,6 +206,9 @@ cmd_finish() {
if ! gitflow_is_branch_merged_into $BRANCH $DEVELOP_BRANCH; then if ! gitflow_is_branch_merged_into $BRANCH $DEVELOP_BRANCH; then
git checkout $DEVELOP_BRANCH || \ git checkout $DEVELOP_BRANCH || \
die "Could not check out $DEVELOP_BRANCH." die "Could not check out $DEVELOP_BRANCH."
# TODO: Actually, accounting for 'git describe' pays, so we should
# ideally git merge --no-ff $tagname here, instead!
git merge --no-ff $BRANCH || \ git merge --no-ff $BRANCH || \
die "There were merge conflicts." die "There were merge conflicts."
# TODO: What do we do now? # TODO: What do we do now?
......
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