How do you use git in web projects?

E

EVEN2012-07-31 08:59:16

git

EVEN, 2012-07-31 08:59:16

I have a task to implement git for a web project now.
After reading the articles habrahabr.ru/post/147260/ and habrahabr.ru/post/127213/ , I did not understand what is the kosher way to have a development branch, and you can fix the current small bugs (put a dot or a comma there.

Here the user Thekondr says that git-flow is a crutch, but here cr0t says that such a thing will not lead to anything good.

Reply

Answer the question

In order to leave comments, you need to log in

6 answer(s)

M

Mikhail Osher, 2012-07-31
@miraage

habrahabr.ru/post/106912/

D

denver, 2012-07-31
@denver

Thekondr said that he can. You can start with git-flow and then learn to merge / tag yourself if you like. And about .git in production, it would be better without it (although .git/ in some frameworks (Symfony) will not be in the root of the site), however, not for everyone, the main thing is that the update is done by a script and not by a person.

N

nifus, 2012-07-31
@nifus

there are 10-15 active projects, the development and refinement of which is ongoing.
all have a common core.
if a fix is made to the kernel on one project, then without any problems it can be implemented on all the others without spending a lot of time on it.

A

andreysmind, 2012-07-31
@andreysmind

we have this: there is a master. each bug or feature is a new branch from the master. when the code is tested, a pool request is created and the code is connected to the master.

F

FanKiLL, 2012-07-31
@FanKiLL

branch to new functionality + merge into the main code branch everything is tested.

R

relgames, 2012-08-12
@relgames

But I don’t understand why branches in svn are so bad? Who's stopping you from doing a feature brunch and then merging it?