This repository was archived by the owner on Dec 15, 2022. It is now read-only.
This repository was archived by the owner on Dec 15, 2022. It is now read-only.
Crash when using accept-as-theirs #2162
Open
Description
Prerequisites
-
Have you tried to reproduce the problem in [Safe Mode][safe-mode]?
-
Have you followed all applicable steps in the [debugging guide][debugging-guide]?
A.dmpfile never showed up. Here is the only file there:
operation_log.txt -
Have you checked the FAQs on the [message board][message-board] for common solutions?
-
Have you checked that your issue [isn't already filed][already-filed]?
Description
When I place the cursor before the |<<<<<<<HEAD (where the "|" is) and try to resolve a merge conflict on Atom using the keymap alt-m, 2 to choose "their" version, Atom crashes. I see this
Steps to Reproduce
- In
git-bash.exetypeatom --safe file_with_merge_conflict.py - Navigate the cursor to before
|<<<<<<<HEAD - Press
alt-m, 2
Expected behavior:
Theirs gets chosen and all github gui elements disappear around the conflict.
Actual behavior:
A freeze/crash.
Reproduces how often:
Always.
Versions
$ atom --version
Atom : 1.37.0
Electron: 2.0.18
Chrome : 61.0.3163.100
Node : 8.9.3
OS: Windows 10 x64