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/11/15 18:14] – tmccanna | newdevs:git:test [2023/06/01 11:58] (current) – udpate branch name from main to master gmcharlton | ||
---|---|---|---|
Line 20: | 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: **git pull** | ||
Line 29: | Line 29: | ||
- 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 44: | 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: **git pull** | ||
newdevs/git/test.1573859678.txt.gz · Last modified: 2022/02/10 13:34 (external edit)