Episode 3 – Source Control Etiquette

This episode is all about source control etiquette. It's a bit different from the last two podcasts we released and we'd love to hear how you liked it! Subscribe on iTunes or Stitcher and make sure to send us your feedback! Show Notes Duration ~56 Discussion on Source Control Etiquette 00:00 - 25:09 A tale of woe, don't push broken code Committing unfinished code Is it okay to be lax when you're working by yourself? Joe watches the voice for Cee Lo (okay, and Xtina) Command Line vs. UI Command Line vs. UI Running a distributed vcs on a centralized server Git vs Mercurial Committing to a new repository Name/Style consistency Proper documentation Proper testing - Don't break the build! The power and majesty of pull requests Trivia Git and Mercurial were both announced in April of 2005! Never Have I Ever 25:09 - 44:06 Leave merged branches hanging around? Deleted anyone elses branch? Lost a branch? Foul language in commits? Amended someone else commit message for grammar/spelling Multiple bug fixes or refactorings in same commit? Are pull requests the new commit? Gigantor pull requests? Commit generated files? Commit documentation? Been lazy about README files? Trivia The proper way to undo merges in git Which language inspires the most cursing Fun Stuff 44:06 - 47:54 Commit Message Generator: http://whatthecommit.com/ Epic Pull Requests: http://epicpullrequests.tumblr.com/ Gifs in GitHub Pull Requests: https://github.com/rails/rails/pull/9001 Tips & Tricks 47:54 - 56:08 Square Selections Source Control Plugins Slow Learn Git Branching: http://pcottle.github.io/learnGitBranching Thanks for the feedback. We’d love to hear your feedback in your iTunes review or at comments@codingblocks.net.

Episode source