title: Is constant merging with Mercurial common practice? Something wrong with this workflow?
body: <p>My company is switching to Mercurial, and we're coming from Subversion.</p>
  
  <p>We're noticing that we're having to do a LOT of merging in our workflow. For instance, if I change a file, commit, pull, update, push, and then my co-worker changes a file, commits, pulls, and updates, he gets a "crosses branches" error and has to do an hg merge. We're having to do this pretty much every single time we want to push to our central repository.</p>
  
  <p>Is something wrong with our workflow?? It seems wrong that in our history for a given file there are going to be a ton of history entries that say "Merging with [changeset id]" "Merging with [changset id]."</p>
  
  <p>Is this just the way it is? Or are we doing something wrong?</p>