Git Flow

Have some feature requests, feedback, cool stuff to share, or want to know where FreeCAD is going? This is the place.
Forum rules
Be nice to others! Read the FreeCAD code of conduct!
User avatar
sliptonic
Posts: 1679
Joined: Tue Oct 25, 2011 10:46 pm

Git Flow

Postby sliptonic » Sun Aug 04, 2013 3:51 pm

I thought this was an interesting article.
http://jeffkreeftmeijer.com/2010/why-ar ... -git-flow/

FreeCAD has such an active community now that I'm finding it hard to keep up with all the development going on. That's not a criticism, just an observation. I don't know if git flow would be a useful tool but it sure makes it easier to juggle the various branches.
User avatar
jriegel
Site Admin
Posts: 3369
Joined: Sun Feb 15, 2009 5:29 pm
Location: Ulm, Germany
Contact:

Re: Git Flow

Postby jriegel » Sun Aug 04, 2013 6:05 pm

I also brought the git-flow model up some time ago, the opinions where mostly against it...

And I'm not using the command line of git, so its not of much value for me...
Stop whining - start coding!
User avatar
NormandC
Posts: 18534
Joined: Sat Feb 06, 2010 9:52 pm
Location: Québec, Canada

Re: Git Flow

Postby NormandC » Mon Aug 05, 2013 2:07 am

jriegel wrote:And I'm not using the command line of git, so its not of much value for me...
I'm curious to know which GUI you're using? The ones I've tested on Ubuntu were less than stellar.

So far I've stuck with the CLI, maybe that's why I still have so much trouble with Git! :?

Well if I was using it regularly I would remember the damn commands...
User avatar
jriegel
Site Admin
Posts: 3369
Joined: Sun Feb 15, 2009 5:29 pm
Location: Ulm, Germany
Contact:

Re: Git Flow

Postby jriegel » Mon Aug 05, 2013 7:31 am

I use SmartGit at the moment, which has several advantages to me:
* You can configure it to do the whole pull-rebase cycle at once.
* It has a password manager for external origiens (like github)
* Good one sight overview over all origiens configured.
* and more.....

Its also on Linux.
Stop whining - start coding!
User avatar
yorik
Site Admin
Posts: 11686
Joined: Tue Feb 17, 2009 9:16 pm
Location: São Paulo, Brazil
Contact:

Re: Git Flow

Postby yorik » Mon Aug 05, 2013 1:59 pm

Interesting, I also had never heard of git flow... I must have missed some posts...
But it is mostly a "helper" no? It helps you to keep your features in nice, packed branches...
It is true that the git history of freecad has an awful lot of commits, but this is the
result of its feverish activity, I'm not sure such a tool would reduce the number of commits,
only send them in batches, instead of one by one...

Maybe one thing we should use more is tagging: for example, I develop a new feature
called "Arch Stairs". When I'll do the big merge, I could add a tag "Arch_Stairs", and
we could do something like that for every big feature added, so people could easily see
the important commits... What do you think?

I also looked at all git GUI available on linux (kgit, gitg, etc..) and liked
none of them, and find myself comfortable with the command line now,
and once everything is well configured (ssh keys, etc) it is really nice too
But that smartgit looks cool indeed, will give it a try...
User avatar
NormandC
Posts: 18534
Joined: Sat Feb 06, 2010 9:52 pm
Location: Québec, Canada

Re: Git Flow

Postby NormandC » Mon Aug 05, 2013 4:00 pm

Thanks jriegel,

I just downloaded SmartGit and gave it a quick try. I usually don't like java apps, but this one looks very nice.
pperisin
Posts: 695
Joined: Wed Oct 20, 2010 12:29 pm

Re: Git Flow

Postby pperisin » Sat Aug 17, 2013 10:27 pm

If you are developing with Qt Creator, I have been working on it's git module recently. If someone was/is using it, I'd like to hear your opinion about it and maybe ideas for new features.

Regards,
Petar