Forked version recommendations

In this board you can talk about general questions about phpMyFAQ

Moderator: Thorsten

Post Reply
Adipsys
Posts: 7
Joined: Mon Jul 03, 2017 10:29 am

Forked version recommendations

Post by Adipsys » Fri Jan 26, 2018 11:19 am

Hello,

My problem is quite simple to understand but as I'm not familiar with git it's quite complicated to choose how to do and what's the best way to do it.

At the moment, I have v2.9.7 in production on which I did some adjustements to fit our needs.
I'd like to version my adjustements and be able to update PMF when a new tag is released on the official repo.

Here's what I started but maybe there's a better way to do it :
- Fork of the project.
- I cloned locally the tag 2.9.7 from my fork.
- I edited files to match my adjustements made on the 2.9.7 in production.
- I think here I might need to create a specific branch starting from that tag 2.9.7 as I guess I can't modify that tag to rename it 2.9.7-myname ?

And then I don't know what's the best way to continue...

I'll appreciate any advices :)
Thanks for your help
Regards
Fabien.

Thorsten
Posts: 14567
Joined: Tue Sep 25, 2001 11:14 am
Location: #phpmyfaq
Contact:

Re: Forked version recommendations

Post by Thorsten » Sat Jan 27, 2018 5:09 pm

Hi Fabien,

you should create an own branch from your forked 2.9 branch. Then you can pull my 2.9 changes into your fork and merge the changes into your own branch.

If your changes are great additions for all users of phpMyFAQ, you can create pull requests at Github to merge them into the main version of phpMyFAQ.

bye
Thorsten
phpMyFAQ Maintainer and Lead Developer
amazon.de Wishlist

Adipsys
Posts: 7
Joined: Mon Jul 03, 2017 10:29 am

Re: Forked version recommendations

Post by Adipsys » Mon Jan 29, 2018 10:36 am

Hi,

Yes that's what I started (my own branch from the forked 2.9 branch)

I'll just need to practice git a bit :)

Thx
Fab

Adipsys
Posts: 7
Joined: Mon Jul 03, 2017 10:29 am

Re: Forked version recommendations

Post by Adipsys » Thu Feb 01, 2018 3:52 pm

Hi Thorsten,

I'd like to understand better the workflow to generate a zip package with the git2package.sh script.

I think this script is supposed to checkout the current branch and then run install of composer, npm, bower... but I think I don't understand what this command is doing.

Code: Select all

git checkout-index -f -a --prefix=$cwd/build/checkout/${PMF_PACKAGE_FOLDER}/
The script is executing properly but the zip contains no files :/

Maybe you have a procedure written somewhere to explain how you generate a zip from a tag ?

Thanks
Fab

Thorsten
Posts: 14567
Joined: Tue Sep 25, 2001 11:14 am
Location: #phpmyfaq
Contact:

Re: Forked version recommendations

Post by Thorsten » Sat Feb 03, 2018 12:24 pm

Hi Fab,

I just tag my current version and create a ZIP package from it directly with my git2package script

bye
Thorsten
phpMyFAQ Maintainer and Lead Developer
amazon.de Wishlist

Post Reply

Who is online

Users browsing this forum: No registered users and 6 guests