News for hackers. Stuff that matters.
Re:Moving from SVN to Git in 1,000 easy steps by jeltz on Friday December 02, 2011 @06:23PM (#3306211)
Additionally for working with multiple fixes at the same time git stash -p, git add -p and friends are great tools. I sometimes see a bug when either fixing another bug or implementing a feature. And if that bug is trivial (i.e. it would take less work to fix it right away compared to remembering it) I can fix it right away, and commit it later in a new branch unrelated to the one I was actually working on.

With svn you really do not want to do this since in my experience you can only work at one thing at a time per checked out directory. Instead you have to write it down or try to remember.

Re:Moving from SVN to Git in 1,000 easy steps by nupark2 on Friday December 02, 2011 @08:21PM (#3306562)
> With svn you really do not want to do this since in my experience you can only work at one thing at a time per checked out directory. Instead you have to write it down or try to remember.

  svn diff >patch-saved-changes
  svn revert -R .
  (work work work)
  svn patch <patch-saved-changes
Re:Moving from SVN to Git in 1,000 easy steps by jeltz on Saturday December 03, 2011 @10:31AM (#3307904)
I used that all the time when coding with svn, and while not as handy has git stash it is workable.

But what I was specifically referring to is the -p flags of various git commands (stash, reset, add, checkout, ...) so you can interactively only stash away what you wish instead of the entire working directory (or an entire subdirectory of it).

Re:Moving from SVN to Git in 1,000 easy steps by nupark2 on Saturday December 03, 2011 @06:49PM (#3309283)
When using git in that way, I spend more time mucking around with cherry picking than I would to just treat things atomically.

The tools are more powerful, but they're also correspondingly more complex, and the net value is in my experience negative.

People simply feel more productive as the number of knobs they're turning increases. However, SCM is the least important knob in my day-to-day development. What matters to me is turning around quick changes with associated unit tests and ultimately committing code that works the first time. The less I think about SCM knobs, the sooner I can move on to the next piece of actual work.

Re:Moving from SVN to Git in 1,000 easy steps by kalid on Friday December 02, 2011 @06:46PM (#3306282)
Totally agree. When first learning git, I got comfortable with git stash: work work, bug comes along, git stash, apply bug to master, git stash apply to get back to my state, work work. Then I started getting comfortable with branches.

Git stash is a killer feature that every developer can relate to, and highlights git's power.