Git for web development

Question

I would like to use git for my web development.

I already have some ideas how to use it but there are still some questions that I have.

First I want to show you my production envoirment. I have a web server on a shared hoster. That means I only have FTP access to it. I have a linux server that is my git server. (bare repo) And I develop with a windows workstation with eclipse.

The main idea that I have is that I develop on my workstation where I have xampp to test my changes (commits). When I am happy with my changes I will push it to my bare repo. This will than update my web server.

Ok to do that I want to use different branches. That means that I want a "Live", "Hotfix" and "Future" branch. Live: Every change should be available online on the web right after pushing. Hotfix: Here I want to make changes and push to the bare repo and if everything is ok I want to put this online later. Future: This are for changes that may be added or not in the future.

The first problem I have is how to configure the branches on my bare repo to work like this.

The second problem that I have is that I only have FTP access. I found 2 ways get this working. 1: Use of git-ftp (there are 2 versions) 2. Mount FTP as a drive. My problem here is that I have some web apps like typo or shop systems that have cache files or can change some files.. So I only want to upload the changes I have made. I don´t want to overwrite everything. Maybe I have to sync the files from my webserver before uploading the changes but I don´t know how to find a good solution for that.

Maybe someone hints how to do that :)

Git changes the game of distributed Web development --> ibm.com/developerworks/web/library/wa-git — Cesar A. Rivas
– Cesar A. Rivas, Commented Nov 23, 2011 at 1:53
This was very useful. Do I have to set up anything in .htaccess for the .git directory or is there a better solution? — user1058712
– user1058712, Commented Nov 23, 2011 at 2:47

user229044 · Accepted Answer · 2011-12-21 16:28:59Z

1

I would take a look at heroku and appharbour for being able to "live publish". This takes away the need for FTP.

Secondly, you may want to look at "git flow" for branch management.

Or if you want to go crazy, you can do proper branch-per-feature if you are disciplined with small features and frequent integration: https://plus.google.com/109096274754593704906/posts/R4qkeyRadLR (read the comments too. Some very good discussion there)

edited Dec 21, 2011 at 16:28

user229044♦

241k41 gold badges347 silver badges350 bronze badges

answered Nov 23, 2011 at 1:32

Adam Dymitruk

131k28 gold badges149 silver badges143 bronze badges

Sign up to request clarification or add additional context in comments.

Collectives™ on Stack Overflow

Git for web development

1 Answer 1

Comments

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

Comments

Your Answer

Sign up or log in

Post as a guest

Related