create_merge_conflict.sh

#!/usr/bin/env bash

# Running: `bash create_merge_conflict.sh`

set -e

PROJECT_NAME="pipenv-merge-conflicts"

# Creating project structure:
rm -rf "$PROJECT_NAME"
mkdir -p "$PROJECT_NAME"
cd "$PROJECT_NAME"
git init

# Installing initial dependencies:
pipenv install django
git add --all
git commit -m 'Initial'

# Making a new branch with `celery`:
git checkout -b feature-celery
pipenv install celery
git add --all
git commit -m 'Adds celery'

# Moving `master` forward by one commit:
git checkout master
pipenv install djangorestframework
git add --all
git commit -m 'Adds rest framework'

# Creating merge conflict:
git merge feature-celery