Development environment
Ilya Protasov
New Member
Posts: 9
9 years 5 months ago #879
by Ilya Protasov
Replied by Ilya Protasov on topic Development environment
Thanks to all for yours experience.
I use CC with Git, but change component version is change all php-files and it's not usable for track changes.
I have added feature request for this: www.component-creator.com/en/forum/featu...on-output-in-php#878
I use CC with Git, but change component version is change all php-files and it's not usable for track changes.
I have added feature request for this: www.component-creator.com/en/forum/featu...on-output-in-php#878
Please Log in or Create an account to join the conversation.
Jonas Fagnastøl Henriksen
New Member
Posts: 15
9 years 5 months ago #880
by Jonas Fagnastøl Henriksen
Replied by Jonas Fagnastøl Henriksen on topic Development environment
Hi,
there is a way to use git efficiently even though cc replaces all files:
before installing your component, check out a branch for the component. This branch will be used only for the bare component innstalled directly from cc. Do Not edit these files after innstalling:
git checkout -b com_yourcomponent
Now innstall the component the normal way. After innstalling, commit the changes, and go back to master (or whatever branch you are working on). Then merge in the changes:
git status # all changed files are listed
git add . #adding all files
git commit -m "Innstalling changes from CC"
Immediately checkout master before accidentially editing the files in the branch com_yourcomponent
git checkout master
git merge com_yourcomponent
Be sure to keep your branch com_yourcomponent after merging, you'll want to reuse it. Now you can make whatever changes you want to the component, without fear that they will be overwritten. Next time you want to innstall changes directly from the component-builder, do the dance all over again:
git checkout com_yourcomponent
Innstall from cc in /administrator
git status # all changed files are listed
git add . #adding all files
(be aware you might have to remove files manually, if you have made changes in cc so that less files are innstalled, f.eks. if you removed a table, or removed frontend editing or similar)
git commit -m "Innstalling changes from CC"
git checkout master
git merge com_yourcomponent
There might be conflicts where both you and cc has made actual changes to the same file, but this is no different than other conflicts using git.
I use this scheme all the time now, it has very few problems. Be aware to close files in your editor as you switch branches, or else you might make a little mess of things,
regards Jonas
there is a way to use git efficiently even though cc replaces all files:
before installing your component, check out a branch for the component. This branch will be used only for the bare component innstalled directly from cc. Do Not edit these files after innstalling:
git checkout -b com_yourcomponent
Now innstall the component the normal way. After innstalling, commit the changes, and go back to master (or whatever branch you are working on). Then merge in the changes:
git status # all changed files are listed
git add . #adding all files
git commit -m "Innstalling changes from CC"
Immediately checkout master before accidentially editing the files in the branch com_yourcomponent
git checkout master
git merge com_yourcomponent
Be sure to keep your branch com_yourcomponent after merging, you'll want to reuse it. Now you can make whatever changes you want to the component, without fear that they will be overwritten. Next time you want to innstall changes directly from the component-builder, do the dance all over again:
git checkout com_yourcomponent
Innstall from cc in /administrator
git status # all changed files are listed
git add . #adding all files
(be aware you might have to remove files manually, if you have made changes in cc so that less files are innstalled, f.eks. if you removed a table, or removed frontend editing or similar)
git commit -m "Innstalling changes from CC"
git checkout master
git merge com_yourcomponent
There might be conflicts where both you and cc has made actual changes to the same file, but this is no different than other conflicts using git.
I use this scheme all the time now, it has very few problems. Be aware to close files in your editor as you switch branches, or else you might make a little mess of things,
regards Jonas
The following user(s) said Thank You: Søren Beck Jensen, Ilya Protasov
Please Log in or Create an account to join the conversation.
Jonas Fagnastøl Henriksen
New Member
Posts: 15
9 years 5 months ago #881
by Jonas Fagnastøl Henriksen
Replied by Jonas Fagnastøl Henriksen on topic Development environment
btw, this totally solves the problem with changing versions: the changed version number will hardly ever result in a merge-conflict, as you will probably not edit the very top part of the file when you are making your changes.
Please Log in or Create an account to join the conversation.
Ike
New Member
Posts: 1
9 years 3 months ago #945
by Ike
Replied by Ike on topic Development environment
Something that would be fantastic, is the ability to have a few pre determined view types that could be manipulated around. This is something that SharePoint does and could be very beneficial to the environment that we are working in. A perfect example is a list view (select the items that you would like to show) and a list view in a calendar form. This way I have something basic to start with to build on.
Please Log in or Create an account to join the conversation.
Andres Maeso
Platinum Member
Posts: 338
9 years 3 months ago - 9 years 3 months ago #946
by Andres Maeso
Andrés Maeso
Customer relations manager at Joomla Component Creator.
This email address is being protected from spambots. You need JavaScript enabled to view it.
Replied by Andres Maeso on topic Development environment
Our friend
Carlos Cámara
suggested that we implement some kind of "push to github" feature to manage this, what do you think? Could version control be managed as Jonas described? Looks like a very interesting feature to me.
Andrés Maeso
Customer relations manager at Joomla Component Creator.
This email address is being protected from spambots. You need JavaScript enabled to view it.
Last edit: 9 years 3 months ago by Andres Maeso.
Please Log in or Create an account to join the conversation.
Time to create page: 0.071 seconds