Hi all

We've been using Git for a few months with our SLX development, but we've been doing a lot of "learning as we go" with it, as no one in our office had any experience with Git. In terms of Source Control, everything that is not SLX goes into TFS (and previously SourceSafe).

We've come up with a model that sort of works:

• Master reflects production


• QA and UAT branches


• A branch for each feature/fix that lives until it goes to production

Thanks to CodeProject I came across this article about Git branching: http://nvie.com/posts/a-successful-git-branching-model/? which has some significant differences to our own. We've also noticed a few problems with our process, although some of that stems from developers not following the process in the first place 

So, if you're using Git, what model do you use?

We're having a meeting on the 18th to discuss the process and any changes we might be able to make, so I'd love to have some feedback from everyone before then!

Personally, I am a huge fan of git-flow (which is the flow and assciated addon set of commands developed by Vincent Driessen from nvie.com). I think it is the best way to work with Git.

I keep things the same way you've described, master reflects production, release branching, branch per feature/hotfix. Git-flow works great for that. Branching per feature is definitely the way to go.

Have you checked out the git-flow proper? It is a set of extension commands for git based on the article you mentioned on nvie.com. You can see an article about using them here http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/

BTW, I do have a video planned for my Git for the SalesLogix Developer Series on using git-flow (but that won't be until after I put up my videos on basic Git daily workflow and normal Git branching)

Thanks for the reply!

Very interested by git-flow, but does it/can it integrate easily with the Git Extensions for Saleslogix? It would feel like a bit of a step backward to move from the brilliant integration with AA to using the command line.

If nothing else, it's certainly shown that nvie's workflow is well liked, so we should be careful to pay attention to it and learn from it!

Right now git-flow does not integrate into Git Extensions for SalesLogix. Only way to use it at the moment is via command-line. I've been thinking of what I will be doing for Git Extensions for SalesLogix v2 and plan on making it built in (as well as dropping the dependency to Git Extensions and just having all native support built-in. Then, having git-flow built in would make more sense as I'll design it from the perspective of how we work in SLX.

But for now, there is just command-line for git-flow. You can easily branch in Git Extensions for SalesLogix, but currently there is nothing as far as *visual* to indicate which branch you're working on.

Well as long as we get the option to do it the standard git way and not just git-flow, then that sounds like a great idea.

I think we're probably going to end up with some adaptation of that workflow.