Hacker News Reader

Surprised he finds git to be complicated. It probably is deep down, but for day-to-day use, compare it to SVN.

Until I switched, there was always a panic when branching or merging. With git, I can branch like a nutter and things seem to still work out in the end.

Not sure why, perhaps someone else has a perspective on it.

View on HN

In my experience it's all fine and dandy until you hit a rebase or merge that needs manual attention.

In mine, not quite. All forms of merges are simple: resolve, add, commit. Inside a rebase I find it harder to memorize whether I need to to the add and/or commit or rebase --continue does it for me.

And conflicts from 'stash pop' are somewhat counterintuitive to handle.

Reply on news.ycombinator.com