Differences

This shows you the differences between two versions of the page.

--- newdevs:git:signoff [2019/06/28 17:58] – tmccanna
+++ newdevs:git:signoff [2024/07/29 09:38] (current) – Remove Step 5 - commit your signoff dyrcona
@@ Line 1: / Line 1: @@
+**New Developers Working Group**
 ====== Git for Windows ======
 ===== How to Sign Off on a Branch =====
+//These instructions are the same regardless of whether you have tested this on your own test server or on a remote test server that has been set up for bug squashing.//
 After you have successfully tested a branch that someone else has created and see that it is working well, you will create a sign-off branch to acknowledge that you have tested it.
   - Find the hash (unique ID) of the commit that you wish to sign off on.
-    * You can find this by following the link from the launchpad bug to [[https://git.evergreen-ils.org]]. When you are looking at the details of the commit, copy the first 7+ characters from the commit code.
+    - Go to: [[https://bugs.launchpad.net/evergreen]]
+    - Find the bug related to the patch you tested.
+    - Follow the link to where the patch resides on the Git server.
+    - When you are looking at the details of the commit, copy the first 7+ characters from the commit code.
   - In Git Bash, navigate to the Evergreen directory.
   - Make sure that your local repository is up to date:
-    - git checkout master
+    - git checkout main
+    - git fetch --all
     - git pull
   - Create and check out a new sign-off branch with the current branch name and append 'signoff':
-    - git checkout -b lp123456_branch_name_signoff
+    - git checkout -b lp123456_branch_name_signoff (will default to base branch off main)
+    - git checkout -b lp123456_branch_name_signoff origin/version (ex: origin/rel_3_11) to base the branch on a specific version
   - Pull in the branch that you wish to sign off on using the commit code you found above.
     - git cherry-pick -s ea75f30d33