[DUG] Delphi GIT Integration

[Barry Neale]

In a rare moment I total agree with Jolyon :-)

When I first started with a distributed version control (Mercurial) I had
various issues, like the ones Jeremy mentioned.
I swore at the system and thought it was a festering pile .

Once I got over that and fully appreciated what this type of system
offered, I wouldn't go back.

I implemented it a few years ago where I worked, the developers had the
same initial reaction that I had, and more than a few times I had to sort
out their instances as they had got themselves confused. But once they got
the concept, and understood it, it works really well.

I think that you can layout your repository whichever way best suits your
development/build/release process.
The biggest thing I found is the two stage process. Commit then push,
conversely Pull then either Update or Merge.

Getting your head around the fact that you commit something locally, then
you can't push it to the server because someone else has pushed something,
necessitating a pull and merge, initially appears frustrating. But having
to do this, and thus making sure that the merged code compiles, runs and
passes any unit tests locally, before sending your code to the server is a
very good thing.




On Mon, Apr 11, 2016 at 8:06 AM, Jolyon Direnko-Smith <jsmith at deltics.co.nz>
wrote:

> I have to say that rather than these being problems intrinsic to Git w.r.t
> small teams, it sounds like you moved to Git without fully adapting your
> workflow.
>
> It is all too easy to fall into the trap of regarding Git as an
> alternative to SVN, but distributed version control is a wholly different
> concept than the server centric model of SVN and its ilk.  It took me a
> while to get my head around the differences but once I did it really was a
> Damascene moment and the pain of reverting to server centric change control
> - when I am forced to do so by dint of the particular environment - is
> almost physical.
>
> On 10 April 2016 at 18:39, Jeremy Coulter <jscoulter at gmail.com> wrote:
>
>> We had already been a location that used SVN across all the teams, but we
>> decided to try Git as part of a new project. But we found we were getting
>> out of Sync. quite easily an generally more work was require to do things
>> i.e before you do a push you need to do pull and when you commit you are
>> not committing to the server etc.
>> I am not saying its not good, we just found it didnt work for us as well
>> as we hoped it might.
>>
>> Jeremy
>>
>> On Sun, Apr 10, 2016 at 5:53 PM, Malcolm Groves <
>> malcolm.groves at embarcadero.com> wrote:
>>
>>> Hi Jeremy,
>>>
>>> I’m curious what it was about git that you found didn’t work with small
>>> teams?
>>>
>>> I’ve heard people knock it back when team members were all co-located,
>>> but not based on small size.
>>>
>>> Cheers
>>> Malcolm
>>>
>>> From: <delphi-bounces at listserver.123.net.nz> on behalf of Jeremy Coulter
>>> Reply-To: NZ Borland Developers Group - Delphi List
>>> Date: Sunday, 10 April 2016 15:29
>>> To: NZ Borland Developers Group - Delphi List
>>> Subject: Re: [DUG] Delphi GIT Integration
>>>
>>> If its for a small team, use SVN. Git really only works properly in big
>>> distributed teams. We recently trialed it for a month or more and have gone
>>> back to SVN because Git didnt really work for our team size. There are 3 in
>>> our team.
>>>
>>> Jeremy
>>>
>>>
>>>
>>> _______________________________________________
>>> NZ Borland Developers Group - Delphi mailing list
>>> Post: delphi at listserver.123.net.nz
>>> Admin: http://delphi.org.nz/mailman/listinfo/delphi
>>> Unsubscribe: send an email to delphi-request at listserver.123.net.nz with
>>> Subject: unsubscribe
>>>
>>
>>
>> _______________________________________________
>> NZ Borland Developers Group - Delphi mailing list
>> Post: delphi at listserver.123.net.nz
>> Admin: http://delphi.org.nz/mailman/listinfo/delphi
>> Unsubscribe: send an email to delphi-request at listserver.123.net.nz with
>> Subject: unsubscribe
>>
>
>
> _______________________________________________
> NZ Borland Developers Group - Delphi mailing list
> Post: delphi at listserver.123.net.nz
> Admin: http://delphi.org.nz/mailman/listinfo/delphi
> Unsubscribe: send an email to delphi-request at listserver.123.net.nz with
> Subject: unsubscribe
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://listserver.123.net.nz/pipermail/delphi/attachments/20160411/640e8503/attachment.html