Commit f2a34160 authored by MEESSEN Christophe's avatar MEESSEN Christophe
Browse files

rename branchName into branch in close_feature

parent 515f936a
......@@ -205,14 +205,14 @@ def close_feature():
if not identifier:
sys.exit(0)
branchName = "feature-%s" % identifier
branch = "feature-%s" % identifier
git("checkout develop")
git("merge --no-ff", branchName)
git("merge --no-ff", branch)
rep = raw_input("Delete the locale branch %s [y/N]" % branchName)
rep = raw_input("Delete the locale branch %s [y/N]" % branch)
if rep == 'y':
git("branch -d", branchName)
git("branch -d", branch)
def close_hotfix():
......
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