tsukasa-mixer

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

tsukasa-mixer

<?php
class SimpleEncoder implements \Iterator
{
    /**
    * @var \Iterator
    */
   private $iterator;
   private $head;
   private $i = 0;

tsukasa-mixer

<?php

namespace Helpers;
use InvalidArgumentException;
use Exceptions\InvalidConfigException;

/**
 * Helper class that create objects and configure it
 *
 * Class Configurator

tsukasa-mixer

<?php
namespace \Application\Exception

class CustomException extends RuntimeException
{
	private $backLink;

	public $defaultMessage = 'Произошла ошибка выполнения скрипта, попробуйте повторить запрос позже';

	public function __construct($message = '', $code = 0, Throwable $previous = null)

tsukasa-mixer

#!/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

<?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>