News for hackers. Stuff that matters.

A comment on Why is git pull considered harmful? (2013). Parent comment

Re:Why is git pull considered harmful? (2013) by korzun on Wednesday March 12, 2014 @11:39AM (#7386232)
No matter how large or small your organization is, you don't work on upstream branch unless you don't understand the whole concept of git.

Even for my personal projects I have my own work and merge to upstream master when I'm ready with a major feature set.

Sure you can work directly on master for small stuff, but for anything else good luck buddy. Humans make errors and it will catch up to you.

[ Parent | on HN ]
Re:Why is git pull considered harmful? (2013) by Guvante on Wednesday March 12, 2014 @12:05PM (#7386426)
> you don't work on upstream branch unless you don't understand the whole concept of git

As painful as it is, it is unavoidable in oddball situations. The problem is everyone leaves it as "don't do that" rather than "don't do that, but if you do, here is how to fix it".

Normally trudging through the doco would get you to the fix, but back to problem #1.

[ Parent | on HN ]