https://github.com/namoscato/resolve-composer-conflict

Utility to automatically resolve composer.lock git conflicts
https://github.com/namoscato/resolve-composer-conflict

composer conflict conflict-resolution git git-conflicts resolver

Last synced: 27 days ago
JSON representation

Utility to automatically resolve composer.lock git conflicts

• Host: GitHub
• URL: https://github.com/namoscato/resolve-composer-conflict
• Owner: namoscato
• License: mit
• Created: 2017-04-02T20:23:04.000Z (over 7 years ago)
• Default Branch: master
• Last Pushed: 2023-03-03T07:05:08.000Z (over 1 year ago)
• Last Synced: 2024-09-28T08:41:34.036Z (about 1 month ago)
• Topics: composer, conflict, conflict-resolution, git, git-conflicts, resolver
• Language: JavaScript
• Homepage:
• Size: 420 KB
• Stars: 4
• Watchers: 2
• Forks: 1
• Open Issues: 9
• Metadata Files:
  • Readme: README.md
  • License: LICENSE

Awesome Lists containing this project

README

        
[![Actions Status](https://github.com/namoscato/resolve-composer-conflict/workflows/ci/badge.svg)](https://github.com/namoscato/resolve-composer-conflict/actions) [![npm version](https://badge.fury.io/js/resolve-composer-conflict.svg)](https://www.npmjs.com/package/resolve-composer-conflict)

# Resolve Composer Conflict

Utility to automatically resolve [`composer.lock`](https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies) git conflicts.

## Installation

```

npm i -g resolve-composer-conflict

```

## Usage

```

resolve-composer-conflict 

```

1. Merges the specified _branch_ into the current branch if a merge is not already in progress

2. Prompts manual resolution of other conflicts if applicable

3. Resolves the `composer.lock` conflict by applying the current branch's updated dependencies to the merge branch's locked versions

4. Commits the merge with a description of the conflicting files