https://github.com/mikulas/gumtree-merge-driver
Custom Git merge driver for AST-level PHP merging
https://github.com/mikulas/gumtree-merge-driver
git merge
Last synced: about 1 month ago
JSON representation
Custom Git merge driver for AST-level PHP merging
- Host: GitHub
- URL: https://github.com/mikulas/gumtree-merge-driver
- Owner: Mikulas
- License: mit
- Created: 2017-04-12T12:42:38.000Z (about 9 years ago)
- Default Branch: master
- Last Pushed: 2017-04-12T12:46:06.000Z (about 9 years ago)
- Last Synced: 2025-09-09T01:40:00.982Z (10 months ago)
- Topics: git, merge
- Language: Shell
- Homepage:
- Size: 1.95 KB
- Stars: 2
- Watchers: 1
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
- License: LICENSE.md
Awesome Lists containing this project
README
GumTree merge driver for Git
============================
## Setup
1. Download GumTree with Merge Client from https://github.com/Mikulas/gumtree/releases/tag/2.1.0-merge
2. Extract the archive and note the path to `gumtree` binary
3. In your Git repository, update your `.git/config` according to the example above. Replace "path-to-gumtree" with the real path.
4. Copy the merge driver into `.git/gumtree-driver` (also in your git repository)
5. Finally, apply `.gitattributes` changes to enable the new merge driver.
## Usage
After the initial setup, merging is completely transparent. Git will automatically invoke the GumTree merge driver when attempting a merge of two php files.