Maksim tsukasa-mixer

## ignore.md

      
              1 file
            
          
              0 forks
            
          
              0 comments
            
          
              0 stars
            
          
                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
              
          
    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


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

## Helpers\Creator.php
<?php

namespace Helpers;
use InvalidArgumentException;
use Exceptions\InvalidConfigException;

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

## CustomException.php
<?php
namespace \Application\Exception

class CustomException extends RuntimeException
{
	private $backLink;

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

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

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

## PlayStation 4.xml
<?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>
	<?php
	class SimpleEncoder implements \Iterator
	{
	/**
	* @var \Iterator
	*/
	private $iterator;
	private $head;
	private $i = 0;
	<?php

	namespace Helpers;
	use InvalidArgumentException;
	use Exceptions\InvalidConfigException;

	/**
	* Helper class that create objects and configure it
	*
	* Class Configurator
	<?php
	namespace \Application\Exception

	class CustomException extends RuntimeException
	{
	private $backLink;

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

	public function __construct($message = '', $code = 0, Throwable $previous = null)
	#!/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
	<?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>