nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

How to prevent 'wrong' merge after checkout?

Michael Sparer

I'm using Sourcetree v1.8.1 and git 1.8.5.2 under OS X 10.9.2. and was wondering how there could be "Uncommited changes" right after checking out a branch from a remote repository. Then I found out that the remote repository has two files in it JavascriptBehavior.java and JavaScriptBehavior.java, my cloned repo however contains only one file (JavascriptBehavior.java). This is because git performs an automatic merge of the two files on checkout and displays the merge as uncommited changes.

I tried to solve this by setting core.ignorecase to false in my global git settings and switching to system git in Sourcetree but to no avail. Is there any way to make Sourcetree respect the core.ignorecase setting, or is there an easier/better way?

Accepted answers

Seth

This is not a Git issue, but an OS issue:

http://apple.stackexchange.com/questions/22297/is-bash-in-osx-case-insensitive

If your filesystem doesn't allow two filenames that are identical except for case, Git has to either not check out one of the files, or merge the files.

Go yell at whichever Linux dev created/named those files, and have him change it so developers on Mac and Windows can use the repo.

All comments

Seth

This is not a Git issue, but an OS issue:

http://apple.stackexchange.com/questions/22297/is-bash-in-osx-case-insensitive

If your filesystem doesn't allow two filenames that are identical except for case, Git has to either not check out one of the files, or merge the files.

Go yell at whichever Linux dev created/named those files, and have him change it so developers on Mac and Windows can use the repo.

Michael Sparer

It is indeed an OS issue that I was hoping to be able to workaround using the core.ignorecase setting, as I was under the wrong impression that my file system is case-sensitive... I'd rather yell at the Apple developer who chose to make it case-insensitive (but obviously case-preserving) than at the Linux dev ;-) Cheers anyway for answering my question!

Seth

It'd be great if case-sensitive filesystems were standard. Apple's implementation is still a step better than Windows, which is only usually case-preserving (in certain conditions it will convert an all upper filename to all lower).

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

sourcetree

case-sensitive