search

OCA / project

Odoo Project Management and Services Company Addons
https://odoo-community.org/psc-teams/project-service-28
GNU Affero General Public License v3.0
287 stars 790 forks source link

[16.0][mig] project_deadline: Migration to 16.0 #1351

Closed anusriNPS closed 1 day ago

anusriNPS commented 1 month ago

Migrating project_deadline to 16.0

Reopened PR: https://github.com/OCA/project/pull/1123

anusriNPS commented 1 month ago

@heliaktiv , I have reopened PR of migrating project_deadline to 16.0 and I would request you to review it

aleuffre commented 1 month ago

Please squash administrative commits, as described here: https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests#mergesquash-the-commits-generated-by-bots-or-weblate

anusriNPS commented 1 month ago

I tried to squash the commit, but it resulted in merge conflict issue related to project_hr commits, so could not do it.

When git rebase -i origin/16.0 is executed, it lists other project related repos like project_hr and showing merge conflicts related to hr project during squash

image

Is there any way to get only project_deadline related commits alone, so that it can be squashed?

aleuffre commented 1 month ago

I tried to squash the commit, but it resulted in merge conflict issue related to project_hr commits, so could not do it.

When git rebase -i origin/16.0 is executed, it lists other project related repos like project_hr and showing merge conflicts related to hr project during squash

image

Is there any way to get only project_deadline related commits alone, so that it can be squashed?

I suspect your repo may be outdated. Can you try git fetch origin 16.0 and then try to rebase again?

coleste commented 6 days ago

Code review: LGTM

anusriNPS commented 1 day ago

As this module is not necessary for migrating into 16.0, closing this MR