Skip to content
Navigation Menu
Toggle navigation
Sign in
Appearance settings
Platform
GitHub Copilot
Write better code with AI
GitHub Spark
New
Build and deploy intelligent apps
GitHub Models
New
Manage and compare prompts
GitHub Advanced Security
Find and fix vulnerabilities
Actions
Automate any workflow
Codespaces
Instant dev environments
Issues
Plan and track work
Code Review
Manage code changes
Discussions
Collaborate outside of code
Code Search
Find more, search less
Explore
Why GitHub
Documentation
GitHub Skills
Blog
Integrations
GitHub Marketplace
MCP Registry
View all features
Solutions
By company size
Enterprises
Small and medium teams
Startups
Nonprofits
By use case
App Modernization
DevSecOps
DevOps
CI/CD
View all use cases
By industry
Healthcare
Financial services
Manufacturing
Government
View all industries
View all solutions
Resources
Topics
AI
DevOps
Security
Software Development
View all
Explore
Learning Pathways
Events & Webinars
Ebooks & Whitepapers
Customer Stories
Partners
Executive Insights
Open Source
GitHub Sponsors
Fund open source developers
The ReadME Project
GitHub community articles
Repositories
Topics
Trending
Collections
Enterprise
Enterprise platform
AI-powered developer platform
Available add-ons
GitHub Advanced Security
Enterprise-grade security features
Copilot for business
Enterprise-grade AI features
Premium Support
Enterprise-grade 24/7 support
Pricing
Search or jump to...
Search code, repositories, users, issues, pull requests...
Search syntax tips
Provide feedback
Saved searches
Use saved searches to filter your results more quickly
Sign in
Sign up
Appearance settings
Resetting focus
You signed in with another tab or window.
Reload
to refresh your session.
You signed out in another tab or window.
Reload
to refresh your session.
You switched accounts on another tab or window.
Reload
to refresh your session.
Dismiss alert
{{ message }}
balbuf
/
composer-git-merge-driver
Public
Notifications
You must be signed in to change notification settings
Fork
7
Star
133
Code
Issues
8
Pull requests
1
Actions
Projects
0
Security
Uh oh!
There was an error while loading.
Please reload this page
.
Insights
Additional navigation options
Code
Issues
Pull requests
Actions
Projects
Security
Insights
Commits
Branch selector
master
User selector
All users
Datepicker
All time
Commit History
Commits on Jun 22, 2020
Merge pull request #12 from glensc/auto-config
Show description for 28c1caf
balbuf
authored
28c1caf
Copy full SHA for 28c1caf
Rework instructions for sample .gitconfig file
balbuf
authored
f8c0a24
Copy full SHA for f8c0a24
Commits on Jul 14, 2019
use vendor/bin path
glensc
authored
dee6cfc
Copy full SHA for dee6cfc
Commits on Apr 15, 2019
add .gitconfig fragment for auto installation in project
glensc
committed
5015cd3
Copy full SHA for 5015cd3
Commits on Jan 23, 2019
Clean up sort packages logic
balbuf
committed
c0ba60d
Copy full SHA for c0ba60d
Merge pull request #8 from ihor-sviziev/patch-2
Show description for 6fe908b
balbuf
authored
6fe908b
Copy full SHA for 6fe908b
Commits on Dec 20, 2018
Merge pull request #7 from ihor-sviziev/patch-1
Show description for eb5ecdd
balbuf
authored
eb5ecdd
Copy full SHA for eb5ecdd
Add package sorting when sort-packages flag is enabled
Show description for 0327b7f
ihor-sviziev
authored
0327b7f
Copy full SHA for 0327b7f
Add package sorting when sort-packages flag is enabled
Show description for d4e1093
ihor-sviziev
authored
d4e1093
Copy full SHA for d4e1093
Add json php extension to dependencies list
ihor-sviziev
authored
f03d981
Copy full SHA for f03d981
Commits on Sep 7, 2018
Update README and composer.json to prepare for packagist
balbuf
committed
1b9d591
Copy full SHA for 1b9d591
Commits on Sep 6, 2018
Merge pull request #5 from oddnoc/composer-module
Show description for 2637e3f
balbuf
authored
2637e3f
Copy full SHA for 2637e3f
Commits on Sep 5, 2018
Convert script to a composer module
Fred Condo
committed
dd8d2d8
Copy full SHA for dd8d2d8
Commits on Jun 15, 2018
Merge pull request #4 from ihor-sviziev/master
Show description for 88e065b
balbuf
authored
88e065b
Copy full SHA for 88e065b
Commits on Jun 14, 2018
Allow to merge composer.lock files in sub-directory
Show description for c1474e8
ihor-sviziev
authored
c1474e8
Copy full SHA for c1474e8
Commits on Feb 21, 2018
Add readme
balbuf
committed
3312d8a
Copy full SHA for 3312d8a
Commits on Feb 20, 2018
No need to handle indentation specially for lock
balbuf
committed
47e5be8
Copy full SHA for 47e5be8
Clarify indentation logic
balbuf
committed
1bbb0be
Copy full SHA for 1bbb0be
Preserve user-preferred indentation based on "our" file
balbuf
committed
d371d6a
Copy full SHA for d371d6a
Properly handle a conflict containing a void
balbuf
committed
0e09aa4
Copy full SHA for 0e09aa4
Comment / var name updates
balbuf
committed
0ba6dc0
Copy full SHA for 0ba6dc0
Working state handling composer.json and .lock files
balbuf
committed
abf8ffd
Copy full SHA for abf8ffd
You can’t perform that action at this time.
Fred Condo