[Gambas-user] Control Backgroung/Foreground colour
Christof Thalhofer
chrisml at ...3340...
Wed Sep 17 18:22:16 CEST 2014
Am 17.09.2014 um 16:39 schrieb Jussi Lahtinen:
>> 1) SVN will not detect a corruption - with Git the sha1 hash will
>> confirm that your source is unadulterated no matter who you pull it from.
>
> Applies to situation where there is more than one repo where to pull. AFAIK
> there isn't for Gambas.
No, that ist for detection of file corruption on disk. Or even file
corruption in general.
> 3) With Git branching and merging are really cheap and hence very fast -
>> SVN fosters long periods of lone worker activity (during which there is
>> no source code control) simply because merging is difficult and you do
>> not want to commit half baked fixes because of the repercussions to
>> other users by forcing more merges on them.
>
> Maybe, I didn't get that far.
Yeah. This is the greatest advantage of Git: You have the complete
repository at your own computer in this one single hidden dir. If you
are working with your code, and want to try out just one simple thing,
you create a new branch:
git branch thisnewbutton
And switch into that branch:
git checkout thisnewbutton
(I write "git co thi<TAB>)
Now start coding and committing by and by. After finished last commit,
switch to branch master:
git checkout master
And do a merge:
git merge thisnewbutton
And you are done.
If you want to send your code to the central main repository you do a
"git push" and that's it.
On my main project lying around on the server I have a master and a
current development branch.
But on my machines where I work on both of these branches I have except
that a couple of branches just for testing and trying out some things.
If something works well, I merge it usually into the development branch
and push that onto the main repo.
If I have to do a hotfix in master + development, i usually fix it in
development and cherry-pick that hotfix into master, even if there are
lots of commits in between.
Another very cool advantage of Git is the superfast git grep. It greps
through the whole project in milliseconds and gives you every occurance
of a string in every file.
> I'm OK with both. Maybe some nice GUI would hide the complexity and make
> git great... sounds just quite a bit of work.
There are lots of different interfaces to Git. I like tig best and use
it all the time. It's fast, easy, usable everyvere. And I use gitweb on
the server to have a look at it in the browser.
http://www.youtube.com/watch?v=ZDR433b0HJY
3 or 5 hours working with Git (understanding staging) and you never want
to go back to SVN any more.
Alles Gute
Christof Thalhofer
--
[x] nail here for new monitor
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.gambas-basic.org/pipermail/user/attachments/20140917/20ec94cb/attachment.sig>
More information about the User
mailing list