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] website_search_header: Migration to 17.0 #1070

Open
wants to merge 8 commits into
base: 17.0
Choose a base branch
from

Conversation

kobros-tech
Copy link

This module is upgraded from the pull #1000 of version 16.0 but is closed.

I don't know why it is not merged, but I make this pull to share the upgraded version if someone needs it.

I have made modifications on the module in JavaScript, if possible we cooperate again and modify the 16.0 version and try to merge it again.

I looking forward to hearing from you...

@JordiBForgeFlow
@ioans73
@pedrobaeza
Screenshot from 2024-11-27 22-56-37

Screenshot from 2024-11-27 22-56-20
ets/2606e76c-059e-4ea5-a382-3b972b2c6c2c)

Screenshot from 2024-11-27 22-56-07

@pedrobaeza
Copy link
Member

Don't lose commit history.

@kobros-tech
Copy link
Author

Don't lose commit history.

Hello @pedrobaeza
Nice to meet you :)

I guess, I did not catch up what you mean.

I see the module pull for 16.0 is closed and we are depending on it for the upper versions up to 18.0

I need to share with the author to make the closed pull request succeeds, but I did not understand as I am still new in the community.

@pedrobaeza
Copy link
Member

Yes, but you have put only one commit, instead of starting from the previous commit history with the initial commit from Jordi, and the rest. This is for preserving the attribution.

@kobros-tech
Copy link
Author

Yes, but you have put only one commit, instead of starting from the previous commit history with the initial commit from Jordi, and the rest. This is for preserving the attribution.

Thanks for clarifications :)
Let me check and fix it.

@kobros-tech
Copy link
Author

Can I fix the issues in the last commit of version 16.0 and make a pull request for him and through this his pull will be merged, then mine.

Or I can just merge this pull if I add the the last commit.

@pedrobaeza
Copy link
Member

With some git fu, you can keep this PR, rewriting the commit history. Save your current files in another location, reset your last commit, and start getting the commit history using a variation of the command in here:

https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-17.0#technical-method-to-migrate-a-module-from-160-to-170-branch

changing the remote to the one of the initial PR.

Then, recopy your files and commit the migration itself.

@kobros-tech kobros-tech force-pushed the 17.0-mig-website_search_header branch 2 times, most recently from 9402b07 to 8729a0c Compare November 28, 2024 13:15
@ioans73
Copy link
Member

ioans73 commented Nov 28, 2024

@kobros-tech is this module really necessary? In version 17.0 we already have a default website search

image

cc @pedrobaeza @JordiBForgeFlow

@kobros-tech
Copy link
Author

kobros-tech commented Nov 28, 2024

I just put it to refer and it is now deprecated after the PR of my boss, #1071

@kobros-tech
Copy link
Author

Dear Mr. @pedrobaeza after tiring job I could keep the log as it should be.

I used git aggregator to keep the log of the authors, then I continued with my hand.
It was hard at the begging to be familiar with this tool, but thanks for having git aggregator!

No very need to merge, although it looks nice and useful.

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.

5 participants