greglevenhagen GregLevenhagen

## Git-Unity-VisualStudio-HoloLens-and-Merging.md

      
              4 files
            
          
              0 forks
            
          
              0 comments
            
          
              1 star
            
          
                GregLevenhagen
                /  Git-Unity-VisualStudio-HoloLens-and-Merging.md
            
            
              Last active
              November 10, 2021 19:51
            
              
                Using Git with Unity, Visual Studio, HoloLens and Handling Merges
              
          
    Using Git with Unity, Visual Studio and optionally HoloLens

This will help with merging of Scenes, Prefabs and Assets when working in Unity team environments.

Place the gitignore and gitattributes files in the base directory of your git repository. The gitconfig contents can go into your global .gitconfig file, in the repo's .git/config file or a custom .gitconfig file. A custom .gitconfig will need to be manually configured by each team member, even if it's in tracked in the repo because it's a security vulnerability.
The gitignore file contains a mashup from the HoloToolkit-Unity gitignore, along with GitHub/gitignore files for Unity and Visual Studio.
The gitconfig file tells git to use Unity's Smart Merge (aka UnityYAMLmerge), which is installed with Unity, to handle YAML merges.

  
## .vimrc
set nocompatible

" Remove ALL auto-commands.  This avoids having the autocommands twice when
" the vimrc file is sourced again.
autocmd!

" Suffixes that get lower priority when doing tab completion for filenames.
" These are files we are not likely to want to edit or read.
set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc

## .bash_profile
# If not running interactively, don't do anything:
[ -z "$PS1" ] && return

export HISTCONTROL=ignoreboth
export HISTSIZE=100000000000

# enable color support of ls
if [ "$TERM" != "dumb" ]; then
    alias ls='ls -GFh'
fi

## FiddlerScript-CustomRules.js
import System;
import System.Windows.Forms;
import Fiddler;

// INTRODUCTION
// This is the FiddlerScript Rules file, which creates some of the menu commands and
// other features of Fiddler. You can edit this file to modify or add new commands.
//
// The original version of this file is named SampleRules.js and it is in the
// \Program Files\Fiddler\ folder. When Fiddler first starts, it creates a copy named

## .vimrc
set nocompatible
source $VIMRUNTIME/mswin.vim
behave mswin

" Remove ALL auto-commands.  This avoids having the autocommands twice when
" the vimrc file is sourced again.
autocmd!

" Suffixes that get lower priority when doing tab completion for filenames.
" These are files we are not likely to want to edit or read.

## .bashrc
# If not running interactively, don't do anything:
[ -z "$PS1" ] && return

export PATH=~/bin:$PATH
export HISTCONTROL=ignoreboth
export HISTSIZE=100000000000

# check the window size after each command and, if necessary,
# update the values of LINES and COLUMNS.
shopt -s checkwinsiz

## .vimrc
set nocompatible

" Remove ALL auto-commands.  This avoids having the autocommands twice when
" the vimrc file is sourced again.
autocmd!

" Suffixes that get lower priority when doing tab completion for filenames.
" These are files we are not likely to want to edit or read.
set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc

## boxstarter
#Install-WindowsUpdate -AcceptEula
#Update-ExecutionPolicy Unrestricted
#Set-ExplorerOptions -showHidenFilesFoldersDrives -showProtectedOSFiles -showFileExtensions
#Enable-RemoteDesktop
#Enable-MicrosoftUpdate
#Set-TaskbarSmall

# install Visual Studio instances, SQL Server first

# Web Platform Installer (get a full list of packages you can install from webpi using "clist -source webpi")
	set nocompatible

	" Remove ALL auto-commands. This avoids having the autocommands twice when
	" the vimrc file is sourced again.
	autocmd!

	" Suffixes that get lower priority when doing tab completion for filenames.
	" These are files we are not likely to want to edit or read.
	set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc
	# If not running interactively, don't do anything:
	[ -z "$PS1" ] && return

	export HISTCONTROL=ignoreboth
	export HISTSIZE=100000000000

	# enable color support of ls
	if [ "$TERM" != "dumb" ]; then
	alias ls='ls -GFh'
	fi
	import System;
	import System.Windows.Forms;
	import Fiddler;

	// INTRODUCTION
	// This is the FiddlerScript Rules file, which creates some of the menu commands and
	// other features of Fiddler. You can edit this file to modify or add new commands.
	//
	// The original version of this file is named SampleRules.js and it is in the
	// \Program Files\Fiddler\ folder. When Fiddler first starts, it creates a copy named
	set nocompatible
	source $VIMRUNTIME/mswin.vim
	behave mswin

	" Remove ALL auto-commands. This avoids having the autocommands twice when
	" the vimrc file is sourced again.
	autocmd!

	" Suffixes that get lower priority when doing tab completion for filenames.
	" These are files we are not likely to want to edit or read.
	# If not running interactively, don't do anything:
	[ -z "$PS1" ] && return

	export PATH=~/bin:$PATH
	export HISTCONTROL=ignoreboth
	export HISTSIZE=100000000000

	# check the window size after each command and, if necessary,
	# update the values of LINES and COLUMNS.
	shopt -s checkwinsiz
	#Install-WindowsUpdate -AcceptEula
	#Update-ExecutionPolicy Unrestricted
	#Set-ExplorerOptions -showHidenFilesFoldersDrives -showProtectedOSFiles -showFileExtensions
	#Enable-RemoteDesktop
	#Enable-MicrosoftUpdate
	#Set-TaskbarSmall

	# install Visual Studio instances, SQL Server first

	# Web Platform Installer (get a full list of packages you can install from webpi using "clist -source webpi")