How to Ignore Merge Conflicts for Specific Files in a Git Repository
Create a directory and git init it
$ mkdir merge-test
$ cd merge-test/
$ git init
Maksim tsukasa-mixer
tsukasa-mixer
/ ignore.md
Created
May 30, 2019 15:04
— forked from tmaybe/ignore.md
ignoring merge conflicts for specific files in a git repository
tsukasa-mixer
/ post-update
Created
July 3, 2017 12:22
— forked from six0h/post-update
Git Post-Update hook that checks for changes to composer.lock, and fires a composer install if required.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/usr/bin/env python | |
| #-*- coding: utf-8 -*- | |
| """A post-update Git hook to execute `composer install` when composer.json changes | |
| :Author: Cody Halovich | |
| :Company: HootSuite Media Inc. | |
| """ | |
| import subprocess |
tsukasa-mixer
/ PlayStation 4.xml
Created
August 17, 2016 17:35
— forked from mseeley/PlayStation 4.xml
Work in progress Plex DLNA profile for the PlayStation 4 Media Player
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <?xml version="1.0" encoding="UTF-8"?> | |
| <Client name="PlayStation 4"> | |
| <!-- Author: Plex Inc. --> | |
| <!-- http://blog.us.playstation.com/2015/06/15/media-player-coming-to-ps4/ --> | |
| <Identification> | |
| <Header name="User-Agent" substring="PlayStation 4" /> | |
| <Header name="User-Agent" substring="UPnP/1.0 DLNADOC/1.50" /> | |
| </Identification> | |
| <TranscodeTargets> |