I'm sure others will pipe up, but one of the biggest problems we had,
apart from the basics of people learning how to use the tool, was some
nasty merge problems. A couple participants ran into merge problems
which seemed to be caused by cross-platform line ending issues (CRLF vs
LF), which ended up with every line of the file flagged as a conflict.
Tor also ran into some problems with the merges not being resolved
successfully, which resulted in the need to revert and reapply his
changes. Meanwhile, others of us had reasonably smooth sailing,
frequently doing fresh pulls from Dick's branch, with easy merges and
only a few conflicts which were smoothly fixed.
We got around some of these problems by not doing full merges back to
Dick's branch. Though some others had made changes and requested that
Dick pull those in, he decided to wait on that process until he had
other time to learn that part of the process. Other merge problems were
corrected via painfully resolving the merge, or in cases like Tor's, by
copying the changes to another directory, doing a fresh pull, then
merging manually.
We had about 10 developers working on 3-4 files, so this was definitely
a stress test for git and github. Additionally, we did not really have
anyone in the room with extensive experience to rescue us when we ran
into trouble. Issues such as the line endings would probably be solved
through proper configuration settings. Other merge issues could prove
easy enough to deal with once we had a certain amount of experience with
the tool.
For those who want to take a look, the forks in question are in github
"rooted" at http://github.com/dickwall/ZenWriterFX. Someone with more
github kung fu might even be able to reconstruct some of our troubles
from the changesets.
Hope that helps
Chris
Joey Gibson wrote:
I've been looking at Hg and git a lot lately, and the possibility of
moving from SVN to one of these. I heard the guys mention that they
had problems using Git and/or Github at the roundup, and I would be
extremely interested to hear what the problems were and how you got
around them (assuming you did). I've only used a DVCS in testing, and
haven't actually used one in production, so any insights would be very
valuable.
Joey
--
Blog: http://joeygibson.com
Twitter: http://twitter.com/joeygibson
FriendFeed: http://friendfeed.com/joeygibson
Facebook: http://facebook.com/joeygibson
--
You received this message because you are subscribed to the Google
Groups "The Java Posse" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/javaposse?hl=en.
--
You received this message because you are subscribed to the Google Groups "The Java
Posse" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/javaposse?hl=en.
