Fork main project to develop smallest one

Adriano Pizzi

Hello,

I manage a project (Project 1) that has different functionalities. My new customer bought a subset of functions of this main project (from now we call Project 2).

Project 2 doesn't have some folders of Project 1 and does not include the objects in those folders.

This customer needs some changes to Project 2.

When I'll make the requests for Project 2 I need to put the changes into Project 1 to improve it and because I don't want two different codes to manage.

If I fork the Project 1 to Project 2 when I make pull request the deleted folders are deleted into Project 1?

Patrik S

Hello @Adriano Pizzi and welcome to the Community!

If you want to merge changes from Project 2 back into Project 1 using a pull request, things can get a bit complex. If you've deleted folders in Project 2 and you create a pull request to merge these changes back into Project 1, those deleted folders would indeed be marked for deletion.

However, there's a "workaround" that may be useful in your case. When you're ready to merge changes from Project 2 to Project 1, you can:

1. Create a new branch in Project 1
2. Merge your changes from Project 2 into this new branch
3. Manually restore the deleted folders in the new branch of Project 1.
4. In Project 1, create a pull request to merge this new branch back into the main branch.

This way, the changes from Project 2 can be incorporated into Project 1 without losing any folders.

Hope that helps! Should you have any questions, feel free to ask.

Thank you, @Adriano Pizzi !

Patrik S