On 13 Nov 07, at 9:15 AM 13 Nov 07, Paul Gier wrote:
Jason van Zyl wrote:
On 12 Nov 07, at 4:21 PM 12 Nov 07, Mark Struberg wrote:
--- Johan Kindgren <[EMAIL PROTECTED]> schrieb:
Maybe it's better to make things easier for the
committers? I've been following this list for a couple of months,
and
it seems to be a reoccuring issue that patches are available but it
takes a (more or less) long time before they are applied.
But thats exactly the big deal with git - it makes merging sooo
easy!
It does. I've never had an easier time integrating are moderate
amount of code. Other then a little burp, which was completely my
fault, it was quite painless.
Just out of curiosity what clients are you guys using for git? Do
you do branching/merging from the command line or do you use a GUI?
It will use whatever merge client you want, but I generally use the
free merge tool from perforce. But it handles merging pretty much
flawlessly and unless you've got a chance in the same file on the same
line it figures it out.
I couldn't find an eclipse plugin yet,
http://repo.or.cz/w/egit.git
and the other gui clients didn't seem that good.
The one that comes with it written in Tcl is not pretty but very
functional.
But the command line tools make most tasks pretty easy.
Read the tutorial. It's really easy to make new branches and merge
them back together.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Thanks,
Jason
----------------------------------------------------------
Jason van Zyl
Founder, Apache Maven
jason at sonatype dot com
----------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]