There’s this article http://nvie.com/posts/a-successful-git-branching-model/ that talks about one approach, but could be overkill for smaller projects/teams.
What I’d do is keep most of your development on master, then have a branch for each release you need to maintain. To release a new version, you branch from master again. Any fixes for older versions get cherry-picked from master, or made in the branch directly if they’re only applicable there.You could also look at using feature branches and pull requests depending on how big your team is, and how much co-ordination and/or code-review you want to use.
Thanks for a very detailed answer
This is a very good article: http://nvie.com/posts/a-successful-git-branching-model/
Nice article. Thanks
We are using SVN (on our own server) to manage source code and other related documents for our Wordpress Theme projects. Problem with SVN is that branches management (different versions of theme) is not straight-forward and quite slow. Merging branches is also complex. Releasing a branch is not possible (you have to export end upload to server by yourself)...
We are looking at Github. Does anyone have experiences using Github to manage your wordpress theme project? How do you prepare folder structure?
My main concern is localhost development.
1. Do you work directly on Git folder or do you work on a local version, then copy into Git folder (then push to Github)?
2. If you work directly on Git folder, so you have to push a full copy of Wordpress to Github?
3. If you work on another copy for localhost, so what is the process? Copy from Git folder to localhost, then after changing, copy from localhost to Git? This is the same process we are using on SVN, and it sometimes causes code conflict or code lost
4. What happens if you want to work on older version of project? Copy to another localhost folder? (Says you are developing 3.9 version, but want to fix 3.8 version?)
Any suggestions/shares would be appreciated. I think it will be useful for many teams
Our theme: GamePlan has been approved. I guess we are the first team who has The Event Calendar & Event Calendar PRO -compatible theme ?http://themeforest.net/item/gameplan-event-and-sport-wordpress-theme/5936266
Our theme was soft-rejected (needs improvement) and the reviewer says
“Some of your files contain validation errors that will need to be fixed. Please be sure that all files validate before resubmitting”
I know that theme HTML needs to be validated as much as possible, but since when this becomes a requirement on ThemeForest? I’ve checked many new themes today and see that they are also not validated.
Does anyone have this problem?
With the release of Gantry 1.31, these notices have gone away