Need help cloning? Visit
is a free Git and Mercurial client for Windows.
is a free Git and Mercurial client for Mac.
Bitbucket cannot automatically merge this request due to conflicts.
Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:
git checkout master
git remote add mbulanov/django-fakesi https://bitbucket.org/mbulanov/django-fakesi.git
git fetch mbulanov/django-fakesi
git merge --no-ff -m 'Merged in mbulanov/django-fakesi (pull request #1)' remotes/mbulanov/django-fakesi/master
I've found that to work correctly fakesi middleware must be placed before djnago's CommonMiddleware and added this info to the docs.