Are these single quotes here by accident? && '('$data( ...

I think this should just be && ($data( ...

They are not by accident. I think that I have the condition right here though it is confusing and there may be something that I'm missing.

When I delete something and trigger this logic I get:

• A: ##class(SourceControl.Git.Change).IsUncommitted(filename) = 1
• B: $data(files(InternalName)) = 0
• C: $data($$$TrackedItems(##class(%Studio.SourceControl.Interface).normalizeName(InternalName))) = 1

So in order to not proceed onto RemoveUncommitted which seems to cause the 'undefined user' issue. I want:
A && '('B && C)

I believe this could be simplified to A && (B || 'C). At the time it seemed reasonable to have the same condition as what is used in #758 and to just negate the whole thing.

OH dear. I had been jumping between languages and erroneously read those as single string quotes instead of logical negations. My mistake. I think your logic is correct.

That said, one pattern I like to follow is that when conditional statements grow to a point where they get hard to mentally parse, I will extract one or more of the conditions into a well named ClassMethod that makes the conditional much easier to read. (so you'd end up with something like if .IsUncommitted(filename) && .IsUntracked(InternalName, .files).) Side benefit: I find class methods like this are relatively easy to unit test when you pass in everything it needs.

I see this more as a nice to have refactoring at this point. 100% up to you if you want to leave this as-is or make further changes.

All good and not a bad idea for me to double check my thinking with the condition anyway.

Re-factoring is a fantastic idea, I've made another commit that does this.