Show Conflict Files not working

[Bio2hazard]

Hey again,

thank you for getting on the other issue so quickly!

I can't seem to get List conflicted files to work. I'm not sure why.

The sublime Git plugin can list all files by executing "Git: Status". I also tried going to the folder in my terminal and using "git diff --name-only --diff-filter=U", and it lists the conflicted files properly.

To clarify, when I run "Git Conflict Resolver: Show Conflict Files" nothing happens. No message, no window, no selection.

Any ideas?

[sascha-wolf]

Have you the git executable in your path? If not you have to tell Git Conflict Resolver the path via the settings.

Some output from the console would be helpful otherwise. You can open it in the "View" menu (Show Console).

[Bio2hazard]

My git executable is in /usr/bin , and /usr/bin is in my $PATH environment variable.

Thank you for telling me how to pull up the console, I had been wondering how to view some form of debug output.

The console output looks like this: Traceback (most recent call last): File "/Applications/Sublime Text.app/Contents/MacOS/sublimeplugin.py", line 526, in run return self.run() File "GitConflictResolver in /Users/felixkastner/Library/Application Support/Sublime Text 3/Installed Packages/Git Conflict Resolver.sublime-package", line 234, in run AttributeError: 'module' object has no attribute 'STARTUPINFO'

I hope that helps!

[sascha-wolf]

I see. STARTUPINFO seems to be only available in Windows machines. Will commit a fix soon.

[sascha-wolf]

Fixed in 1.4.5. Thanks for your help.

[Bio2hazard]

Hey, thank you for addressing the issue.

Unfortunately, I still have a bug with it: It opens the wrong path.

The problem seems to be that it tries to open the destination based on the current folder, rather than the git root.

So if I am editing solution/project/folder/file.ext and open the list of conflicting files and select one, it'll try to open solution/project/folder/project2/folder2/otherfile.ext - when it should be opening solution/project2/folder2/otherfile.ext - in other words, it does not backtrack to the git-root.

I hope this makes sense.

[sascha-wolf]

I probably shouldn't have tried to fix all this yesterday while being pretty tired, I guess. :laughing:

Could you do me a favor and clone the dev branch into your "Sublime Text/Packages" folder (you can open it via Preferences -> Browse Packages...) so you can test the current state of development?

I don't want to make a fool of me again by making a hastly release.

[Bio2hazard]

About to go to bed, but I'll be able to test in around 10 to 12 hours.

Used to live in Germany, time zones are a pain. :/ On Sep 25, 2014 11:17 PM, "Sascha Wolf" notifications@github.com wrote:

I probably shouldn't have tried to fix all this yesterday while being pretty tired, I guess. [image: :laughing:]

Could you do me a favor and clone the dev branch into your "Sublime Text/Packages" folder (you can open it via Preferences -> Browse Packages... so you can test the current state of development?

I don't want to make a fool of me again by making a hastly release.

— Reply to this email directly or view it on GitHub https://github.com/Zeeker/sublime-GitConflictResolver/issues/8#issuecomment-56923612 .

[Bio2hazard]

Hey,

the dev branch version opens the files properly.

Thank you for your awesome work!

Edit: This is a simple QoL improvement: Can you make it actually activate the sublime text input area after you select a conflict file to open ?

Currently I press alt + ctrl + c to open the list, select one, hit enter to load it - and then it won't recognize keypresses until I click inside the actual editor window. No biggie, but it'd be great to not have to click at all. :)

[sascha-wolf]

I currently playing a bit around but this seems to be suprisingly difficult. I'll open a new issue for this and still make the release without this enhancement.

Thanks for your suggestions and time!