title: Local project workflow with Mercurial Hg and Bitbucket
body: <p>Usually I create my websites (PHP, HTML, CSS) local on my mac. I've MAMP and Mercurial (Hg) installed.</p>
  
  <p>When I start a new project I draw up a new project directory in "htdocs" and begin with <code>hg init</code>. New files were added by <code>hg add</code> to the project or excluded in <code>.hgignore</code>. All changes in this project are completed with an <code>hg commit</code>.</p>
  
  <p>Additional to the local project I push my whole project into a private repository to Bitbucket (<code>hg push https://bitbucket.org/MyUser/MyProjectRepository</code>). That works perfectly.</p>
  
  <p>The problem begins when a second person works at the project at the same time. He clones with <code>hg clone https://bitbucket.org/MyUser/MyProjectRepository</code> my private Bitbucket repository.</p>
  
  <p>When I change and commit a css file local on my mac, push it afterwords to Bitbucket and the second person changes something on his local css file at the same time he gets a merge problem when he he tries to push his changes to Bitbucket.</p>
  
  <p>Does anyone know what the problem is?</p>