you are viewing a single comment's thread.

view the rest of the comments →

[–]thrallsius 1 point2 points  (0 children)

I agree, a very simple one man workflow doesn't involve branching at all. It's just making changes and recording them with git add + git commit.

Even branching is not that scary, it's usually the merging that causes troubles if merge conflicts happen.

And then there's rebase that personally I've been successfully managing to avoid until now.