Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIG][16.0] Migration of datev_export_xml #149

Closed
wants to merge 2 commits into from

Conversation

jsierp
Copy link

@jsierp jsierp commented Feb 23, 2024

No description provided.

@pedrobaeza
Copy link
Member

Thanks for the contribution.

Please preserve commit history following technical method explained in https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-16.0.

If the jump is between several versions, you have to modify the source branch in the main command to accommodate it to this circumstance.

@OSevangelist
Copy link
Contributor

@fkantelberg can you fix that as well ?

@fkantelberg
Copy link
Member

I mean I can superseed the PR but I can't push to the source repository nor do I want to claim the migration work

@tv-openbig
Copy link
Contributor

@jsierp Hello Jan, i have just merged the following PR (V15):
#126

I hope that helps to prevent the commit history.
@hbrunn Is a new PR required ?

@hbrunn
Copy link
Member

hbrunn commented Mar 14, 2024

no, if @jsierp does the above and force pushes, this one will be good to merge. Or if you're in a hurry and Jan doesn't have time to get back to this, I think it's okay to say

git checkout origin/16.0 -b 16.0-mig-datev_export_xml
git format-patch --keep-subject --stdout origin/16.0..origin/15.0 -- datev_export datev_export_xml | git am -3 --keep --ignore-whitespace
git remote add solvti https://github.com/solvti/l10n-germany
git fetch solvti
git cherry-pick 7e02524 -X theirs
git cherry-pick bb472b8

then you end up with a branch that is the same code as this one, but has history and important, you keep the attribution.

Not super polite, but also not super insulting in my book.

@OSevangelist
Copy link
Contributor

@jsierp @akselnooit would you mind to get this right, otherwise we gonna close this and create a new PR with the preserved history but this would be somewhat highjacking your contribution we would be glad if you fix it yourself. Thanks a lot in advance. Cheers fyi @tv-openbig

@jsierp jsierp closed this Mar 19, 2024
@jsierp jsierp deleted the 16.0-mig-datev_export_xml branch March 19, 2024 14:48
@jsierp
Copy link
Author

jsierp commented Mar 19, 2024

Hello, I have created a new PR: #153 does the git history look correct now?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants