search

SRombauts / UEGitPlugin

Unreal Engine 5 Git LFS 2 Source Control Plugin (beta)
http://srombauts.github.io/UEGitPlugin
MIT License
806 stars 165 forks source link

Change conflict state icon to ModifiedOtherBranch #113

Closed ccarvalheiro closed 4 years ago

ccarvalheiro commented 4 years ago

Now that NotAtHeadRevision is supported I think that we probably should avoid using the same representation for the conflict state.

SRombauts commented 4 years ago

Hi, I have doubts on this, I think the warning icon is way better than the blue icon to warn about merge conflict

ccarvalheiro commented 4 years ago

Hi. The ModifiedOtherBranch icon is a red exclamation mark just like the warning icon. That's why I suggested it. I do agree that a blue version wouldn't be a better option than the yellow one. image Am I missing something here?

SRombauts commented 4 years ago

Hum, indeed, it seems that I have been mistaken, good job!