12 posts CactusThemes Forum
  • Elite Author
  • Won a Competition
  • Most Wanted Bounty Winner
  • Sold between 100 000 and 250 000 dollars
  • Exclusive Author
  • Referred between 1 and 9 users
  • Bought between 50 and 99 items
  • Has been a member for 1-2 years
cactusthemes says

Hi,

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 :)

8 posts
  • Bought between 1 and 9 items
  • Has been a member for 0-1 years
northize says

I personally use GitHub since it’s so easy to use.

Regarding the structure and if you keep it locally or not depends on the project for me. For the most though, I develop all projects locally and then just push to GitHub as it progresses.

For example, I might have a project under development at localhost/project/. I just make that a github repository and push all changes made as it goes along.

If I was in your place, i’d probably set up repositories locally either of different wordpress versions or theme versions vise. For example, localhost/wp.x.x.x/ or for themes: localhost/themes/3.x/ etc etc.

In this case, it would be easy to just make the changes in any of those themes and versions, and then just push it back to GitHub. It would also make it easy to lets say if you want to change your development computer or w/e, you can just clone the whole rep and you’re almost ready.

Anyway, that’s probably the way I would do it. I’m sure that it’s probably other ways to do it that might fit better just for you, I guess it’s a matter of personal opinion.

Good luck with it. :)

913 posts
  • Author had a Free File of the Month
  • Football Contest Participant/Runner-up
  • Grew a moustache for the Envato Movember competition
  • Sold between 10 000 and 50 000 dollars
  • Beta Tester
  • Envato Studio (Microlancer) Beta Tester
  • Exclusive Author
  • Bought between 50 and 99 items
  • Referred between 1 and 9 users
+2 more
greenline says

When I was a team leader, we always used SVN and I like it most (Eclipse IDE has in fact a very useful Team Synchronizing (visual ! ) Perspective and View, so merging branches and managing releases was a very simple process. And we worked with a very big project, much bigger than a WordPress theme and never had issues coming from merges.

There is the Eclipse Helios release – this iDE is very helpful when it comes to using SVN. In a visual way, you don’t have to use complicated command lines, etc….

Personally I don’t trust GitHub, I know it has the option to mark a project private or password-protected, but still, it’s a public place…...

8 posts
  • Bought between 1 and 9 items
  • Has been a member for 0-1 years
northize says
BitBucket is an pretty sweet option to GitHub if you don’t like it. https://bitbucket.org/
31 posts
  • Has been a member for 2-3 years
  • Sold between 1 000 and 5 000 dollars
  • Referred between 1 and 9 users
  • Author had a File in an Envato Bundle
  • Exclusive Author
  • Romania
nachothemes says

1. I personally do all the coding in a local repository, but for a larger project like a theme, you may need some centralized sources

2. It would be better to sync only the theme folder. Syncing the whole wordpress folder, doesn’t make sense, since databases won’t be copied when cloning

3. The workflow is to clone a folder, do the changes and sync to server. If both folders have changed, you should be careful when merging to avoid losing code.

4. Branch and merge the changes in the new version

Hopefully my answers give you an idea of how the workflow goes. If not, there are lots of Git tutorials online to help you decide

1864 posts YOU TOUCH IT YOU BUY IT
  • Bought between 100 and 499 items
  • Referred between 200 and 499 users
  • Has been a member for 5-6 years
  • Won a Competition
  • Repeatedly Helped protect Envato Marketplaces against copyright violations
  • Elite Author
  • Sold between 250 000 and 1 000 000 dollars
+1 more
FRESHFACE says

... there are lots of Git tutorials online to help you decide

This is a very good article: http://nvie.com/posts/a-successful-git-branching-model/

We do something like that but we don’t use the develop branch since we don’t really need it, main developer branch is simply the default master for us. The latest stable version on our demo server is automatically checked out from the latest tag which are always stable.

252 posts Mad Dog
  • Elite Author
  • Sold between 250 000 and 1 000 000 dollars
  • Most Wanted Bounty Winner
  • Exclusive Author
  • Has been a member for 3-4 years
  • Bought between 10 and 49 items
  • Referred between 500 and 999 users
+1 more
mad_dog says

Using BitBucket for about 2 years, satisfied.

575 posts Magento Elite & Gravity Maker
  • Elite Author
  • Sold between 100 000 and 250 000 dollars
  • United States
  • Has been a member for 4-5 years
  • Referred between 50 and 99 users
  • Bought between 1 and 9 items
  • Exclusive Author
GravityDept says

Hard to believe anyone still uses SVN (cough…WordPress) given that git has massively outgrown it in popularity in the last six years. Definitely time to switch over.

12 posts CactusThemes Forum
  • Elite Author
  • Won a Competition
  • Most Wanted Bounty Winner
  • Sold between 100 000 and 250 000 dollars
  • Exclusive Author
  • Referred between 1 and 9 users
  • Bought between 50 and 99 items
  • Has been a member for 1-2 years
cactusthemes says

This is a very good article: http://nvie.com/posts/a-successful-git-branching-model/

Nice article. Thanks :)

12 posts CactusThemes Forum
  • Elite Author
  • Won a Competition
  • Most Wanted Bounty Winner
  • Sold between 100 000 and 250 000 dollars
  • Exclusive Author
  • Referred between 1 and 9 users
  • Bought between 50 and 99 items
  • Has been a member for 1-2 years
cactusthemes says

Hard to believe anyone still uses SVN (cough…WordPress) given that git has massively outgrown it in popularity in the last six years. Definitely time to switch over.

because SVN can still do all the jobs ;)

by
by
by
by
by
by