newdevs:git:test
Differences
This shows you the differences between two versions of the page.
| Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
| newdevs:git:test [2019/06/28 19:06] – tmccanna | newdevs:git:test [2023/06/01 11:58] (current) – udpate branch name from main to master gmcharlton | ||
|---|---|---|---|
| Line 1: | Line 1: | ||
| + | **New Developers Working Group** | ||
| ====== Git for Windows ====== | ====== Git for Windows ====== | ||
| Line 13: | Line 14: | ||
| The next steps will be somewhat different depending on whether you have direct access to a test server that has Git installed or whether you have file access via WinSCP or another file transfer program. | The next steps will be somewhat different depending on whether you have direct access to a test server that has Git installed or whether you have file access via WinSCP or another file transfer program. | ||
| - | ===== Option A: Testing When You Have File Access ===== | + | ===== Option A: Testing When You Have File Access |
| ==== A1. Update Your Local Repository ==== | ==== A1. Update Your Local Repository ==== | ||
| Line 19: | Line 20: | ||
| - Open Git Bash on your computer. | - Open Git Bash on your computer. | ||
| - Navigate into your Evergreen repository. | - Navigate into your Evergreen repository. | ||
| - | - If the master | + | - If the main branch isn't currently checked out, check it out: **git checkout |
| - | - Make sure your local repository is current: git pull | + | - Make sure your local repository is current: |
| ==== A2. Create a Testing Branch ==== | ==== A2. Create a Testing Branch ==== | ||
| - | - Create and checkout a local testing branch: git checkout -b lp12345_branch_name | + | - Create and checkout a local testing branch: |
| * This branch does not have to have the same name as the branch you will be testing, but it makes it easier to keep track of. | * This branch does not have to have the same name as the branch you will be testing, but it makes it easier to keep track of. | ||
| - | - Pull changes into the testing branch using the unique commit id: git cherry-pick 7ab7281f5 | + | - Pull changes into the testing branch using the unique commit id: **git cherry-pick 7ab7281f5** |
| - | * If you receive an error while cherry picking, you can stop it: git cherry-pick --abort | + | * If you receive an error while cherry picking, you can stop it: **git cherry-pick --abort** |
| + | * If the branch has multiple commits, you can cherry-pick them one at a time (oldest to newest) or you can cherry-pick a range of commits at once (oldest to newest): **git cherry-pick 7ab7281f5^..8lgls9a34** | ||
| ==== A3. Upload Changed Files ==== | ==== A3. Upload Changed Files ==== | ||
| Line 43: | Line 45: | ||
| - Open Git Bash on the server as the root user. | - Open Git Bash on the server as the root user. | ||
| - Navigate into your Evergreen repository. | - Navigate into your Evergreen repository. | ||
| - | - If the master | + | - If the main branch isn't currently checked out, check it out: git checkout |
| - | - Make sure your local repository is current: git pull | + | - Make sure your local repository is current: |
| ==== B2. Create a Testing Branch ==== | ==== B2. Create a Testing Branch ==== | ||
| - | - Create and checkout a local testing branch: git checkout -b lp12345_branch_name | + | - Create and checkout a local testing branch: |
| * This branch does not have to have the same name as the branch you will be testing, but it makes it easier to keep track of. | * This branch does not have to have the same name as the branch you will be testing, but it makes it easier to keep track of. | ||
| - | - Pull changes into the testing branch using the unique commit id: git cherry-pick 7ab7281f5 | + | - Pull changes into the testing branch using the unique commit id: **git cherry-pick 7ab7281f5** |
| - | * If you receive an error while cherry picking, you can stop it: git cherry-pick --abort | + | * If you receive an error while cherry picking, you can stop it: **git cherry-pick --abort |
| + | ** | ||
| ==== B3. Upload Changed Files ==== | ==== B3. Upload Changed Files ==== | ||
newdevs/git/test.1561763203.txt.gz · Last modified: 2022/02/10 13:34 (external edit)