Common git operations » History » Version 1
cryptogopher, 2019-05-04 22:54
| 1 | 1 | cryptogopher | h1. Common git operations |
|---|---|---|---|
| 2 | |||
| 3 | |||
| 4 | Prerequisites: |
||
| 5 | <pre> |
||
| 6 | cd ~/plugins/issue_recurring |
||
| 7 | </pre> |
||
| 8 | |||
| 9 | h2. Issue resolution in separate branch |
||
| 10 | |||
| 11 | h3. Merge branch into master |
||
| 12 | |||
| 13 | # Push uncommited changes on branch. |
||
| 14 | # Checkout and update master: |
||
| 15 | <pre> |
||
| 16 | $ git checkout master |
||
| 17 | $ git pull |
||
| 18 | </pre> |
||
| 19 | # Merge and push issueN branch: |
||
| 20 | <pre> |
||
| 21 | $ git merge issueN |
||
| 22 | $ git push |
||
| 23 | </pre> |
||
| 24 | # Delete merged branch from local and remote: |
||
| 25 | <pre> |
||
| 26 | $ git branch -d issueN |
||
| 27 | $ git push origin :issueN |
||
| 28 | </pre> |
||
| 29 | # Verify: |
||
| 30 | <pre> |
||
| 31 | $ git branch -a |
||
| 32 | </pre> |