3 ms·
Git Work Flow For Rails Developers
- erlanger 17y agoIn case any other Rails devs expect domain-specific info here: > Although I mention “Rails” in the title of this post, the work-flow I define below is not “Rails” specific and can be applied to any project where multiple deployment branches need to be maintained. Nice little intro to git workflows, but the title's deliberately misleading.
- jseifer 17y agoThis is good advice. One thing I prefer that's different from the article is squashed merges from a branch I've been working on, that makes it really easy to undo any changes. The syntax is easy, also: git merge --squash branchname
- inklesspen 17y agoDoesn't that destroy history, though?
- jrockway 17y agoSort of. It's still in the reflog. But anyway, if you are only squashing to make reverts easier, get comfortable with the reflog. You can do your operations normally and revert them with the help of "git reflog" and the usual "git reset" invocation.
- moe 17y agoThere has been a better article of this kind not so long ago: http://reinh.com/blog/2009/03/02/a-git-workflow-for-agile-teams.html http://reinh.com/blog/2009/03/02/a-git-workflow-for-agile-te... It describes effectively the same workflow, but with more background.