Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Corrected links that should have been relative instead of absolute.

...

[14:49:23 CDT(-0500)] <EricDalquist> I wonder how they deal with conflicts

[14:49:48 CDT(-0500)] <EricDalquist> also that branching model article you posted is very good

[14:49:57 CDT(-0500)] <EricDalquist> I'm going to link to it on the uportal lists after the migration tomorrow

[14:49:59 CDT(-0500)] <holdorph> i think i got it from bill thompson.

[14:50:26 CDT(-0500)] <holdorph> but i couldnt' find the original g+ post, so I just had to find it somewhere and repost it

[14:50:33 CDT(-0500)] <EricDalquist> one of the best explanations of the value of git (from a developer/project management perspective) I've seen

[14:50:45 CDT(-0500)] <holdorph> carl's followup article made some good points too, as long as you're using github

[14:50:59 CDT(-0500)] <holdorph> i have one project that isn't using github, though....

[14:53:05 CDT(-0500)] <EricDalquist> yeah, it is still all doable then, just requires more work to track forks and stuff manually :/