Merge pull request #71 from cisagov/improvement/update_git_terminology

Update git terminology in conflict template from checkout to switch with appropriate switch
cisagov · Jun 7, 2023 · b782591 · b782591
2 parents 5c9f505 + 0a41d14
commit b782591
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/lineage/_version.py b/src/lineage/_version.py
@@ -1,2 +1,2 @@
 """This file defines the version of this module."""
-__version__ = "0.2.4"
+__version__ = "0.2.5"
diff --git a/src/lineage/templates/conflict_template.md b/src/lineage/templates/conflict_template.md
@@ -26,7 +26,7 @@ that you must resolve before merging this pull request!
     git remote add {{ lineage_id }} {{ remote_url }}
     git remote set-url --push {{ lineage_id }} no_push
     git switch {{ local_branch }}
-    git checkout -b {{ pr_branch_name }} --track origin/{{ local_branch }}
+    git switch --create {{ pr_branch_name }} --track origin/{{ local_branch }}
     git pull {{ lineage_id }} {{ remote_branch }}
     git status
     ```