25 lines
749 B
Markdown
25 lines
749 B
Markdown
|
## Merging a Branch:
|
||
|
|
|
||
|
|
`git checkout <to-merge>`
|
||
|
|
`git pull`
|
||
|
|
`git push`
|
||
|
|
`git checkout <merge-into>`
|
||
|
|
`git pull`
|
||
|
|
`git merge <to-merge>`
|
||
|
|
`git push`
|
||
|
|
`git tag archive/<to-merge>`
|
||
|
|
`git branch -d <to-merge>`
|
||
|
|
`git push --tags`
|
||
|
|
`git push -d origin <to-merge>`
|
||
|
|
`git remote prune origin`
|
||
|
|
|
||
|
|
## branch management
|
||
|
|
|
||
|
|
"develop" is the upstream branch. We will keep it clear of our own commits (unless we want to request that they are pulled upstream)
|
||
|
|
Here is the command to make a remote for the upstream to fetch new changes from into develop, which we can then merge into master:
|
||
|
|
|
||
|
|
`git remote add upstream https://github.com/frappe/erpnext.git`
|
||
|
|
|
||
|
|
"production" should rebase onto master to deploy
|
||
|
|
other branches should branch off of master and get merged back into it.
|