From 801aa0424e594b4be697a676bc58c3c385dd2d04 Mon Sep 17 00:00:00 2001 From: mpenning Date: Wed, 11 Oct 2023 11:02:28 -0500 Subject: [PATCH] Remove NotImplementedError --- dev_tools/git_helper.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev_tools/git_helper.py b/dev_tools/git_helper.py index b15ec7be..7ed5e7ed 100644 --- a/dev_tools/git_helper.py +++ b/dev_tools/git_helper.py @@ -542,9 +542,8 @@ def main(args): raise ValueError("FATAL tag {} already exists".format(tag_value)) assert get_branch_name(args) == "main" - ## FIXME git merge command below does NOT merge anything... - raise NotImplementedError("git merge functionality is broken... it cannot merge the develop branch into main") + ## FIXME git merge command below does NOT merge anything... cmd = f"git merge {original_branch_name} -m '{args.message}'" return_code, stdout, stderr = ciscoconfparse.ccp_util.run_this_posix_command(cmd)