Rebase or merge on a shared feature branch: what does your team do, and why?

Merge keeps history honest when several people push to one branch. Rebase is cleaner when one person owns it. Agree on it once and write it in the contributing doc.