Annotated the code with some TODO-notes.
diff --git a/git-flow-release b/git-flow-release
index 8c12f65..9750cc8 100644
--- a/git-flow-release
+++ b/git-flow-release
@@ -206,6 +206,9 @@
if ! gitflow_is_branch_merged_into $BRANCH $DEVELOP_BRANCH; then
git checkout $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 || \
die "There were merge conflicts."
# TODO: What do we do now?