Tips for development - CosmosTUe/Cosmos GitHub Wiki

Resolve pipenv merge conflicts

  1. Resolve conflicts in Pipfile if any
  2. Run `pipenv lock' to generate new lockfile
  3. Mark pipfile.lock as resolved