You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Normally it's not possible to view a file under conflict in the diff view. However, if you have a diff view open and undo the last discard made and this action results in merge conflicts, the diff view remains open and the following error from what-the-diff appears "Expected "@@ -" or "@@@ -" but end of input found."
This is because what-the-diff is not equipped to parse diffs for files under conflict, and really we don't want to be doing this anyway. Instead we should detect if the file being displayed in the diff view is under conflict, and if it is, rather than display the diff we should display a message saying the file is under conflict, perhaps with a button to open the file and view the conflicts.
Versions
GitHub Package Version (git --git-dir ~/.atom/packages/github/.git rev-parse head): 45e4e18
Normally it's not possible to view a file under conflict in the diff view. However, if you have a diff view open and undo the last discard made and this action results in merge conflicts, the diff view remains open and the following error from
what-the-diffappears"Expected "@@ -" or "@@@ -" but end of input found."This is because
what-the-diffis not equipped to parse diffs for files under conflict, and really we don't want to be doing this anyway. Instead we should detect if the file being displayed in the diff view is under conflict, and if it is, rather than display the diff we should display a message saying the file is under conflict, perhaps with a button to open the file and view the conflicts.Versions
GitHub Package Version (
git --git-dir ~/.atom/packages/github/.git rev-parse head): 45e4e18