From 5311d68de38d23649d9bef81b103ed3e06329b91 Mon Sep 17 00:00:00 2001 From: Rohan Kapadia Date: Mon, 10 Mar 2014 15:03:30 +0530 Subject: [PATCH] Updated the comments to make more sense. Now explains why the file is ignored and what steps should be taken before the sublime project file is committed. --- Global/SublimeText.gitignore | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Global/SublimeText.gitignore b/Global/SublimeText.gitignore index c207181d..81154f2d 100644 --- a/Global/SublimeText.gitignore +++ b/Global/SublimeText.gitignore @@ -3,6 +3,9 @@ # project files should be checked into the repository, unless a significant # proportion of contributors will probably not be using SublimeText -# removed the comment to ignore the project file as different users store projects in different directories. -# Leads to path mismatches. +# By default sublime text will use the full path to the project root in the project files path setting. +# This leads to merge conflicts unless it is manually changes. According to sublime documentation, it is recommended to +# commit the project file in the repository. +# It is first suggested to change the path setting to the relative setting so it will work uniformly for all users. +# http://www.sublimetext.com/docs/2/projects.html *.sublime-project