How to Merge Git
6 Agustus, 2024 oleh
Administrator
| No comments yet




1. Git Checkout di branch yang akan di merge
odoo@LAPTOP-64OILOE3:/opt/odoo/odoo17/pt-jala-lintas-media-odoo17ee$ sudo git branch

* Development

* main

2. Pindah ke Branch No-open-True

odoo@LAPTOP-64OILOE3:/opt/odoo/odoo17/pt-jala-lintas-media-odoo17ee$ sudo git checkout Development

Switched to branch 'Development'

3. Pull Branch Main di Branch Development

odoo@LAPTOP-64OILOE3:/opt/odoo/odoo17/pt-jala-lintas-media-odoo17ee$ sudo git pull origin main

Username for 'https://gitlab.alphasoft.co.id': akhumaini

Password for 'https://akhumaini@gitlab.alphasoft.co.id':

remote: Enumerating objects: 24, done.

remote: Counting objects: 100% (24/24), done.

remote: Compressing objects: 100% (24/24), done.

remote: Total 24 (delta 5), reused 0 (delta 0), pack-reused 0

Unpacking objects: 100% (24/24), 11.17 KiB | 120.00 KiB/s, done.

From https://gitlab.alphasoft.co.id/alphasoft/pt-jala-lintas-media-odoo17ee

* branch main -> FETCH_HEAD

942f739..e9c987d main -> origin/main

Merge made by the 'recursive' strategy.

aos_iom/models/purchase_request.py | 7 +++++++

aos_iom/views/purchase_request.xml | 11 +++++++----

aos_iom/wizard/iom_to_pr.py | 26 +++++++++++++-------------

aos_printout_iom/reports/iom_report_template.xml | 45 +++++++++++++++++++++++++++++++++++----------

aos_printout_iom/reports/report_action.xml | 6 +++---

aos_purchase_request_printout/reports/purchase_request_report_template.xml | 36 ++++++++++++++++++------------------

6 files changed, 83 insertions(+), 48 deletions(-)

odoo@LAPTOP-64OILOE3:/opt/odoo/odoo17/pt-jala-lintas-media-odoo17ee$ sudo git push

Username for 'https://gitlab.alphasoft.co.id': akhumaini

Password for 'https://akhumaini@gitlab.alphasoft.co.id':

Enumerating objects: 13, done.

Counting objects: 100% (13/13), done.

Delta compression using up to 4 threads

Compressing objects: 100% (5/5), done.

Writing objects: 100% (5/5), 607 bytes | 303.00 KiB/s, done.

Total 5 (delta 4), reused 0 (delta 0)

remote:

remote: View merge request for No-open-True:

remote: https://gitlab.alphasoft.co.id/alphasoft/pt-jala-lintas-media-odoo17ee/-/merge_requests/8

remote:

To https://gitlab.alphasoft.co.id/alphasoft/pt-jala-lintas-media-odoo17ee.git

43211d0..e446591 No-open-True -> No-open-True

odoo@LAPTOP-64OILOE3:/opt/odoo/odoo17/pt-jala-lintas-media-odoo17ee$ sudo git push

Username for 'https://gitlab.alphasoft.co.id': akhumaini

Password for 'https://akhumaini@gitlab.alphasoft.co.id':

Everything up-to-date

odoo@LAPTOP-64OILOE3:/opt/odoo/odoo17/pt-jala-lintas-media-odoo17ee$





di dalam Tutorial Odoo
Administrator 6 Agustus, 2024
Share this post
Label
Arsip
Masuk to leave a comment