flycarl

Using Git with Unity

Noise: Unity editor has lots of temporary files that we don’t want git to track
Broken object references: Unity keeps track of objects created by using random GUIDs, and if they aren’t tracked using .meta files then there can be conflicts that really break your project
Unresolvable merge conflicts: files like scene files that are written in confusing languages (like YAML) that are supposed to be translations of Unity editor actions into code. Most likely, you cannot resolve using Git, and the only way to resolve merge conflicts is to open it in a text editor and resolve them manually while hoping you don't mess anything up because these files are confusing and not meant to be manipulated directly.
Large files: Sometimes assets are large and take up a lot of storage space

	#
	# Git attributes for Unity projects
	#
	# Compiled by the GameCI community under the MIT license - https://game.ci
	#
	# Latest version at https://gist.github.com/webbertakken/ff250a0d5e59a8aae961c2e509c07fbc
	#

	# Ensure that text files that any contributor introduces to the repository have their line endings normalized
	* text=auto

	#if CSHARP_7_OR_LATER
	#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member

	using System;
	using UnityEngine;
	using UnityEngine.AddressableAssets;
	using UnityEngine.ResourceManagement;

	namespace UniRx.Async
	{

	using UnityEngine;

	public class EnumFlagAttribute : PropertyAttribute
	{
	public string enumName;

	public EnumFlagAttribute() {}

	public EnumFlagAttribute(string name)
	{

	// Developed by Tom Kail at Inkle
	// Released under the MIT Licence as held at https://opensource.org/licenses/MIT

	// Must be placed within a folder named "Editor"

	using System;
	using System.Collections.Generic;
	using System.IO;
	using UnityEditor;
	using UnityEngine;

	using System;
	using System.Collections;
	using System.Collections.Generic;
	using UnityEngine;
	using System.Threading;

	namespace Sa1 {

	/// <summary>
	/// ins: do not use timeout in the csp.subthread

	/*
	* Copyright (C) 2014 The Android Open Source Project
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software

	using UnityEngine;
	using System.Collections;

	/// <summary>
	/// Automatically scales quality up or down based on the current framerate (average).
	/// </summary>
	///
	/// \author Kaspar Manz
	/// \date 2014-03-10
	/// \version 1.0.0