https://github.com/janole/merge-conflicts

Show merge conflicts between two branches
https://github.com/janole/merge-conflicts

ci-cd cicd conflict conflicts git git-flow merge

Last synced: 12 days ago
JSON representation

Show merge conflicts between two branches

• Host: GitHub
• URL: https://github.com/janole/merge-conflicts
• Owner: janole
• License: mit
• Created: 2020-10-20T16:56:47.000Z (about 4 years ago)
• Default Branch: master
• Last Pushed: 2020-12-15T14:47:30.000Z (about 4 years ago)
• Last Synced: 2024-11-13T00:48:23.598Z (about 1 month ago)
• Topics: ci-cd, cicd, conflict, conflicts, git, git-flow, merge
• Language: JavaScript
• Homepage:
• Size: 16.6 KB
• Stars: 0
• Watchers: 2
• Forks: 0
• Open Issues: 0
• Metadata Files:
  • Readme: README.md
  • License: LICENSE

Awesome Lists containing this project

README

        
# merge-conflicts

Just a **quick** hack to be able to check the *mergability* of two branches ...

```bash

$ npx merge-conflicts origin/feature/whatever origin/stable

CONFLICT   base   100644 77cfa58d94e8e06a2d2500468fff6f86ea820876 composer.json

CONFLICT   base   100644 640c614c8fcf697086c0e7ed3775a32da1758ada composer.lock

```