search

sascha-wolf / sublime-GitConflictResolver

A little plugin to help you resolving this nasty conflicts.
MIT License
44 stars 6 forks source link

Index Error on Find Next Conflict. #6

Closed lsiden closed 10 years ago

lsiden commented 10 years ago

Getting the following traceback when I send "Find Next Conflict".

Traceback (most recent call last):
  File "/opt/sublime_text/sublime_plugin.py", line 549, in run_
    return self.run(edit)
  File "GitConflictResolver in /home/lsiden/.config/sublime-text-3/Installed Packages/Git Conflict Resolver.sublime-package", line 199, in run
  File "GitConflictResolver in /home/lsiden/.config/sublime-text-3/Installed Packages/Git Conflict Resolver.sublime-package", line 112, in find_conflict
  File "/opt/sublime_text/sublime.py", line 492, in __getitem__
    raise IndexError()
IndexError

Build 3059.

Let me know if you need any more info.

sascha-wolf commented 10 years ago

I'm sorry that it took so long. I'm currently on vacation but I took a look.

This was a brain fart on my part. Will commit a fix as soon as I have a stable internet connection.

Thank you for using the plugin.

lsiden commented 10 years ago

Hey, np. Thanks for your great work!

-Larry Siden, http://plus.google.com/+LarrySiden

On Sat, Aug 30, 2014 at 11:57 AM, Sascha Wolf notifications@github.com wrote:

Closed #6 https://github.com/Zeeker/sublime-GitConflictResolver/issues/6 via 7dc3359 https://github.com/Zeeker/sublime-GitConflictResolver/commit/7dc33591b431697db60b8ec40303f64e63e87f98 .

— Reply to this email directly or view it on GitHub https://github.com/Zeeker/sublime-GitConflictResolver/issues/6#event-159291449 .