newdevs:git:create
Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
newdevs:git:create [2019/07/30 10:03] – [3. Make Your Changes] tmccanna | newdevs:git:create [2024/03/12 15:10] (current) – tmccanna | ||
---|---|---|---|
Line 1: | Line 1: | ||
+ | **New Developers Working Group** | ||
====== Git for Windows ====== | ====== Git for Windows ====== | ||
Line 9: | Line 10: | ||
- Open Git Bash | - Open Git Bash | ||
- 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 |
- Before making any changes, make sure your local files are up to date with latest changes: | - Before making any changes, make sure your local files are up to date with latest changes: | ||
<code bash> | <code bash> | ||
- | git pull origin | + | git pull origin |
</ | </ | ||
Line 22: | Line 23: | ||
<code bash> | <code bash> | ||
+ | git checkout -b lp123456_launchpad_bug_description | ||
+ | </ | ||
+ | |||
+ | Note: In most cases you will want to create a branch based off of main. You can do this either by a) specifying main on the command line: | ||
+ | |||
+ | <code bash> | ||
+ | git checkout -b lp123456_launchpad_bug_description main | ||
+ | </ | ||
+ | |||
+ | Or, b) you can switch to main first and then create the new branch. This also gives you the opportunity to make sure your local copy of main is updated first: | ||
+ | |||
+ | <code bash> | ||
+ | git checkout main | ||
+ | git pull origin main | ||
git checkout -b lp123456_launchpad_bug_description | git checkout -b lp123456_launchpad_bug_description | ||
</ | </ | ||
Line 33: | Line 48: | ||
* To stage //all// changed files, use: git add -A | * To stage //all// changed files, use: git add -A | ||
* If you accidentally stage a file you didn't mean to, you can unstage it: git reset HEAD myfilename.txt | * If you accidentally stage a file you didn't mean to, you can unstage it: git reset HEAD myfilename.txt | ||
+ | - If you are adding a new feature (as opposed to a bug fix), you will also need to create a release note file. Look in the RELEASE_NOTES_NEXT folder for a template and examples: | ||
+ | * https:// | ||
- Commit the staged changes: **git commit -s** | - Commit the staged changes: **git commit -s** | ||
* Note: The -s portion adds the sign-off line for you. | * Note: The -s portion adds the sign-off line for you. | ||
- | - When your text editor opens to write the commit message, the first line should be the launchpad number and name, followed by the description (with test instructions if relevant), followed by your sign off. For example: | + | - When your text editor opens to write the commit message, the first line should be the launchpad number and name, followed by the description (with test instructions if relevant), |
LP#1406387 Fix for Holds Placement Advanced Options | LP#1406387 Fix for Holds Placement Advanced Options | ||
Line 56: | Line 73: | ||
[4] Test placing a hold directly from the catalog and confirm that the | [4] Test placing a hold directly from the catalog and confirm that the | ||
staff or patron barcode is carried over from the main hold page. | staff or patron barcode is carried over from the main hold page. | ||
+ | | ||
+ | Release-note: | ||
| | ||
Signed-off-by: | Signed-off-by: |
newdevs/git/create.1564495410.txt.gz · Last modified: 2022/02/10 13:34 (external edit)