0.3.11 • Published 4 years ago
resolve-composer-conflict v0.3.11
Resolve Composer Conflict
Utility to automatically resolve composer.lock
git conflicts.
Installation
npm i -g resolve-composer-conflict
Usage
resolve-composer-conflict <branch>
- Merges the specified branch into the current branch if a merge is not already in progress
- Prompts manual resolution of other conflicts if applicable
- Resolves the
composer.lock
conflict by applying the current branch's updated dependencies to the merge branch's locked versions - Commits the merge with a description of the conflicting files
0.3.11
4 years ago
0.3.10
5 years ago
0.3.9
6 years ago
0.3.8
6 years ago
0.3.7
6 years ago
0.3.6
6 years ago
0.3.5
7 years ago
0.3.4
7 years ago
0.3.3
7 years ago
0.3.2
7 years ago
0.3.1
7 years ago
0.3.0
7 years ago
0.2.1
7 years ago
0.2.0
7 years ago
0.1.4
7 years ago
0.1.3
7 years ago
0.1.2
7 years ago
0.1.1
7 years ago
0.1.0
7 years ago