annotate CSP2/CSP2_env/env-d9b9114564458d9d-741b3de822f2aaca6c6caa4325c4afce/opt/bbmap-39.01-1/docs/git.txt @ 68:5028fdace37b
planemo upload commit 2e9511a184a1ca667c7be0c6321a36dc4e3d116d
| author |
jpayne |
| date |
Tue, 18 Mar 2025 16:23:26 -0400 |
| parents |
|
| children |
|
| rev |
line source |
|
jpayne@68
|
1 This is an example of updating the repository with nonconflicting changes.
|
|
jpayne@68
|
2
|
|
jpayne@68
|
3 First, ensure the correct branch is active: git checkout dev
|
|
jpayne@68
|
4 Ensure everything looks correct: git status
|
|
jpayne@68
|
5 Update: git pull origin dev
|
|
jpayne@68
|
6 Add the new files: git add .
|
|
jpayne@68
|
7 Commit changes: git commit -m 'changes go here'
|
|
jpayne@68
|
8 Push: git push origin dev
|
|
jpayne@68
|
9 Checkout master: git checkout master
|
|
jpayne@68
|
10 Merge changes: git merge dev
|
|
jpayne@68
|
11 Ensure everything looks correct: git status
|
|
jpayne@68
|
12 Tag the new version: git tag -a v38.21 -m 'Version 38.21'
|
|
jpayne@68
|
13 Push the changes: git push origin master --tags
|
|
jpayne@68
|
14 Switch back to dev: git checkout dev
|
|
jpayne@68
|
15 Compiled code (.class files, etc) are ignored in this repo; when Jenkins sees the push, it will recompile everything, using the Eclipse JDK, which produces faster bytecode than Oracle’s.
|
