Hi,
On 2013-05-24 09:33, Bruno Cassol wrote:
> Hi,
> we have the following setup and I would like advice/help. I'm not even sure
> if this the correct setup.
>
> DEVELOPERS WORKSTATIONS (Windows/TortoiseGit)
> c:\xamp\htdocs\intranet/
> |
> | push / pull
> V
> DEV (CentOS/ssh)
> /home/git/repos
You can always have a look at how git itself is 'managed' in terms of its
branches that Junio (maintainer) integrates. That is, he has lots of
sub-branches for each contributer's patch series that are merged into 'pu'
(potential updates) at various points (and rewound when they are updated or
e
Thanks for your reply!
We are currently not using branching in git. Perhaps that's why I tried to
map different branches in different servers/repos in my mind.
I'm afraid the team lacks experience with distributed version control in
general.
I guess we will need to sit down and learn git so we c
I'd agree branching is "all that" and should be the way to do development,
it's more of a question of *how many* branches you go with and being
sensible about it. As your branch count proliferates then it can become
more complicated to keep track of what is going on, what's being done
where, et
If I've understood correctly, rather than pushing specific commits it might
be better to have the developers working on feature branches and those
features only get merged into a development/integration branch when they're
ready for release. Then you would push the development/integration (or a
On Wed, 2013-05-22 at 20:02 +0100, Roddie wrote:
> This is just an example. The general point is about how branches are
> not, in reality, completely independent, and work on one can affect
> another.
>
> What should I do?
>
> I have the feeling that I'm missing the point about branches. Everyon
Hi,
we have the following setup and I would like advice/help. I'm not even sure
if this the correct setup.
DEVELOPERS WORKSTATIONS (Windows/TortoiseGit)
c:\xamp\htdocs\intranet/
|
| push / pull
V
DEV (CentOS/ssh)
/home/git/repos/intranet/ (bare)
/var/www/html/intranet/ (working/apache)
|