|
@ -13,6 +13,7 @@ Addons Forge |
|
|
|
|
|
|
|
|
cd addons-dev |
|
|
cd addons-dev |
|
|
|
|
|
|
|
|
|
|
|
git remote add upstream git@github.com:yelizariev/addons-dev.git |
|
|
git remote add addons-yelizariev https://github.com/yelizariev/addons-yelizariev.git |
|
|
git remote add addons-yelizariev https://github.com/yelizariev/addons-yelizariev.git |
|
|
git remote add pos-addons https://github.com/yelizariev/pos-addons.git |
|
|
git remote add pos-addons https://github.com/yelizariev/pos-addons.git |
|
|
git remote add mail-addons https://github.com/yelizariev/mail-addons.git |
|
|
git remote add mail-addons https://github.com/yelizariev/mail-addons.git |
|
@ -20,7 +21,7 @@ Addons Forge |
|
|
git remote add website-addons https://github.com/yelizariev/website-addons.git |
|
|
git remote add website-addons https://github.com/yelizariev/website-addons.git |
|
|
git remote add l10n-addons https://github.com/yelizariev/l10n-addons.git |
|
|
git remote add l10n-addons https://github.com/yelizariev/l10n-addons.git |
|
|
|
|
|
|
|
|
# Development |
|
|
|
|
|
|
|
|
# New branch |
|
|
|
|
|
|
|
|
# specify target repo and branch: |
|
|
# specify target repo and branch: |
|
|
export REPO=addons-yelizariev BRANCH=9.0 |
|
|
export REPO=addons-yelizariev BRANCH=9.0 |
|
@ -34,13 +35,12 @@ Addons Forge |
|
|
# develop addons, create commits |
|
|
# develop addons, create commits |
|
|
# ... |
|
|
# ... |
|
|
|
|
|
|
|
|
# push to your fork |
|
|
|
|
|
git push origin addons-yelizariev-9.0-some-feature |
|
|
|
|
|
|
|
|
# push to upstream |
|
|
|
|
|
git push upstream addons-yelizariev-9.0-some-feature |
|
|
|
|
|
|
|
|
|
|
|
# PR to existed branch |
|
|
|
|
|
|
|
|
# create PR to addons-dev repo |
|
|
|
|
|
# then PR is checked and merged |
|
|
|
|
|
# then your update is tested again |
|
|
|
|
|
# then clean addon is pull-requested to target repo (see next section) |
|
|
|
|
|
|
|
|
If branch (e.g. addons-yelizariev-9.0-some-feature) already exists, send commits to your fork first and then create PR. |
|
|
|
|
|
|
|
|
# Final PR to target repo |
|
|
# Final PR to target repo |
|
|
|
|
|
|
|
|