A Python module for identifying which files have merge conflicts between two branches in a Git checkout.

Navigation

Verified details

These details have been verified by PyPI
Maintainers
Avatar for chrisgavin from gravatar.com chrisgavin

Unverified details

These details have not been verified by PyPI
Project links
Meta
  • Requires: Python >=3.5
Classifiers

Project description

The author of this package has not provided a project description

Project details

Verified details

These details have been verified by PyPI
Maintainers
Avatar for chrisgavin from gravatar.com chrisgavin

Unverified details

These details have not been verified by PyPI
Project links
Meta
  • Requires: Python >=3.5
Classifiers

Release history Release notifications | RSS feed

This version

1.0.4

1.0.3

1.0.2

1.0.1

1.0.0

Download files

Download the file for your platform. If you're not sure which to choose, learn more about installing packages.

Source Distribution

conflictify-1.0.4.tar.gz (1.9 kB view details)

Uploaded Source

File details

Details for the file conflictify-1.0.4.tar.gz.

File metadata

  • Download URL: conflictify-1.0.4.tar.gz
  • Upload date:
  • Size: 1.9 kB
  • Tags: Source
  • Uploaded using Trusted Publishing? No
  • Uploaded via: twine/1.12.1 pkginfo/1.5.0.1 requests/2.21.0 setuptools/40.6.3 requests-toolbelt/0.8.0 tqdm/4.29.1 CPython/3.6.3

File hashes

Hashes for conflictify-1.0.4.tar.gz
Algorithm Hash digest
SHA256 f405415f23962d99f2aef0b916a6e251427a95de74f0680a9feacdcb5dc695b4
MD5 e3b918b8514b8d73149b11162701599c
BLAKE2b-256 f5ad1a7ed660ed0d1f7941a6fca807c37062c015a2623e9bce29921532ec39d7

See more details on using hashes here.

Supported by

AWS AWS Cloud computing and Security Sponsor Datadog Datadog Monitoring Fastly Fastly CDN Google Google Download Analytics Microsoft Microsoft PSF Sponsor Pingdom Pingdom Monitoring Sentry Sentry Error logging StatusPage StatusPage Status page