[QUOTE=kracker;363911]
EDIT: I have frankly, never tried git :smile: I'll see if I can find a guide, will probably be useful in the future.
[/QUOTE]

Walk, no run and read this [url]http://git-scm.com/[/url] and [url]http://git-scm.com/documentation[/url]
You will not regret the time spent learning git.

[QUOTE=garo;363946]You will not regret the time spent learning git.[/QUOTE]

Indeed! :smile:

And for a more "cathedral" (vs. "bazaar") development environment that you're the authority for, Subversion can be a very good friend.

[QUOTE=garo;363946]Walk, no run and read this [url]http://git-scm.com/[/url] and [url]http://git-scm.com/documentation[/url]
You will not regret the time spent learning git.[/QUOTE]

Thanks :smile:

[QUOTE=chalsall;363950]Indeed! :smile:

And for a more "cathedral" (vs. "bazaar") development environment that you're the authority for, Subversion can be a very good friend.[/QUOTE]

Until you try merging divergent branches...

You can have cathedral control in git by picking what you merge into your repository...

[QUOTE=Mark Rose;363965]Until you try merging divergent branches...

You can have cathedral control in git by picking what you merge into your repository...[/QUOTE]

Are you arguing that git is superior to svn for merging?

That has not been my experience (for small teams I'm responsible for), but very happy to have other perspectives on the available options.

[QUOTE=chalsall;363966]Are you arguing that git is superior to svn for merging?

That has not been my experience (for small teams I'm responsible for), but very happy to have other perspectives on the available options.[/QUOTE]

It's the collective experience of everyone where I work. We're a small team of about 10. The amount of forking and merging between branches we do daily would be impossible in svn.

The biggest paradigm shift in moving from cvs/svn to git is that there is not "the repository", but a multitude of repositories that can merge in branches from each other. git is very flexible, especially when bits of work depend on other bits in other branches that haven't been merged into the main release branch yet.

Sometimes merges aren't flawless, but the vast majority of the time they require no human intervention, even if the same file has been modified in the two branches being merged. Only if the specific lines changed conflict do you need too manually merge.

I'm no git expert, but it makes collaborating very easy in my experience.

Can I merge Prime95 with mfaktc/o and cudaLucas/clLucas together and run the resulting exe on the [URL="http://en.wikipedia.org/wiki/Engine_control_unit"]ECU[/URL] of my Altis? (it has ARM mcu, and the altis' engine iself has a lot of horse power!)

:unsure:

Not sure how you intended to say that :razz:

In the past 20 years I have used about a dozen version control systems starting from SCCS all the way down to git and mercurial with CVS, SVN and a host of proprietary systems thrown in. IMAO none is as good as git. (hg comes close). After all, in which other VCS can you do a 32-way octopus merge and come out alive to tell the tale?

[QUOTE=Mark Rose;363982]I'm no git expert, but it makes collaborating very easy in my experience.[/QUOTE]

OK, thanks for that.

I tend to work with very small teams (two or three others at most), and I'm a bit of a "control freak". :smile:

[QUOTE=garo;364018]In the past 20 years I have used about a dozen version control systems starting from SCCS all the way down to git and mercurial with CVS, SVN and a host of proprietary systems thrown in. IMAO none is as good as git. (hg comes close). After all, in which other VCS can you do a 32-way octopus merge and come out alive to tell the tale?[/QUOTE]

It's almost like git were written by a man who needed to deal with thousands of contributors and millions of lines of code and no existing VCS was capable...