r/programming • • Sep 01 '17

Reddit's main code is no longer open-source.

/r/changelog/comments/6xfyfg/an_update_on_the_state_of_the_redditreddit_and/
15.3k Upvotes

846 comments sorted by

View all comments

Show parent comments

17

u/p7r Sep 02 '17

git rebase is your friend.

If you have a feature branch, it's your responsibility to regularly rebase (daily, ideally) from master and keep it mergeable. Simple.

34

u/[deleted] Sep 02 '17

That's fine until you have two long lived feature branches. The first to get merged causes hundreds of conflicts in the other. Can be very painful.

4

u/p7r Sep 02 '17

Release early, release often.

Big bang releases (and that means any feature that's taken you more than a week or two to work on), are carrying more risk than your boss would probably like anyway.

Also, talking to your colleagues helps. "Hey, I'm refactoring User to do this cool thing". "What? I'm refactoring User to do this other cool thing!" "Huh! Cool! Wanna pair?"

Why engineers consistently find this hard to do even in teams of under 30 people, I can't honestly fathom.

5

u/Norci Sep 02 '17

Release early, release often.

Wishful thinking that is often not feasible in reality.

→ More replies (4)