Quite common question, customers are asked by customers. Imagine that you have built a panel, downloaded, then I decided to modify code locally. After a while, you have to build another new CRUD on the top – how do you merge the changes?
It’s delicate. We have two ways to help you, but even then you will have to do manual work.
1. Download only modified files
After each CRU change, the system is preparing a separate archive with only the files that have been modified in the last CRUD update. Then you know “in complete safety” which files to crush – you simply download these archives and put the files in places.
You will also see if your locally modified files exist in this archive, in this case, you open both versions and manually merge the modifications.
2. Use GitHub / Bitbucket integration
Our agency plan customers have a “magic button” called Git.
Here is a quick video.
https://www.youtube.com/watch?v=k0a1gktxiac
What he does is pushing a new branch To your GitHub / Bitbucket with the latest version of your panel code. The system does not know what changes you have made in your repository or locally, it simply pushes the latest version. From there, you must merge changes manually, but it is much easier with git fusion tools than to do manually.
It is similar to see how Laravel Shift works when upgrading your Laravel version – it puts a new branch with suggested Code after upgrading, with a lot of comments, then you decide what is really merged.
Yes, it’s always manual
Even having these two ways to help you merge is still not so comfortable, you must always do manual work by comparing changes and choosing the right ones.
So far, we have not found a better way, because our system does not know what local changes you have made and we cannot accept your code to merge the cause online, so our generator would break with your personalized code . But if you have any ideas how we can improve it, please send me an email personally povilas@laraveldaily.com – More than happy to discuss.
In addition, QuickadminPanel was initially designed for the first fast version of the administration panel, not in case someone would build it. So, what we do internally, when we use QuickAdminPanel for customer projects, we generate as much as possible with the generator (yes, this requires a lot of reflection in advance with the DB diagram and the pen / paper), then After download, we do not touch a generator at all – all other modifications are made locally in Phpstorm.
It not only makes it possible to avoid such code conflicts, but also forces to think in advance, which is really beneficial for the project as a whole.
