You'll potentially need to use merge if you're collaborating with others on feature branches.