11

Merge commits. Is it really that hard to keep your feature branch up to date with master?

Comments
  • 2
    Teach them, people are just lazy to learn things on their own some times.

    Try to enlighten someone to make it a stardard
  • 3
    And if that doesn't work, get your manager to micromanage them for half an hour. They'll remember in future.
  • 0
    Add a hook that automatically rebases on master before merge.
  • 1
    This is something I actually need to learn, being new to git
Add Comment