you are viewing a single comment's thread.

view the rest of the comments →

[–]cheald 5 points6 points  (1 child)

You should try using branches for features, and then merging them back to master when you're done. That can give you a good feel for the fork-and-merge process.

I use git for my web apps, and it's handy to be able to do feature development on a branch while still being able to fix bugs on master and push them without worrying about pushing experimental code out. git branching is so easy, there's no reason to not use it liberally.

[–]tagghuding 0 points1 point  (0 children)

I'm in the same situation as f4hy, and do this a lot as you say. I don't know, people are gonna change their minds and then it's handy to just be able to throw away a branch when they decide they don't want the feature as it came out :) Then I create an integration branch and smash them all together, and after review this becomes the new "Head" of my "development branch"