[FIX] replace a few more references to trunk with master
This commit is contained in:
parent
24d594ab94
commit
5313714530
|
@ -70,14 +70,14 @@ Basic development workflow
|
||||||
* update your remotes with ``git fetch --all``
|
* update your remotes with ``git fetch --all``
|
||||||
* create your development branch with ``git checkout -b <branch_name>
|
* create your development branch with ``git checkout -b <branch_name>
|
||||||
<source_branch>``. For instance if you wanted to add support for full-text
|
<source_branch>``. For instance if you wanted to add support for full-text
|
||||||
search in trunk you could use ``git checkout -b trunk-fts-xxx odoo/master``
|
search in master you could use ``git checkout -b master-fts-xxx odoo/master``
|
||||||
* do your changes, stage them with ``git add`` and commit them with ``git
|
* do your changes, stage them with ``git add`` and commit them with ``git
|
||||||
commit``
|
commit``
|
||||||
* if your branch is long-lived, you may want to update it to its parent
|
* if your branch is long-lived, you may want to update it to its parent
|
||||||
|
|
||||||
- update the remotes with ``git fetch --all``
|
- update the remotes with ``git fetch --all``
|
||||||
- merge the remote branch into the local one with ``git merge --no-ff
|
- merge the remote branch into the local one with ``git merge --no-ff
|
||||||
odoo/trunk``
|
odoo/master``
|
||||||
|
|
||||||
* to push the branch to the development repository, use ``git push -u dev
|
* to push the branch to the development repository, use ``git push -u dev
|
||||||
<branchname>``, this will automatically create a branch called
|
<branchname>``, this will automatically create a branch called
|
||||||
|
|
Loading…
Reference in New Issue