This repository was archived by the owner on Dec 15, 2022. It is now read-only.
Repository navigation
This repository was archived by the owner on Dec 15, 2022. It is now read-only.
Merge commit message unexpectedly displayed in Atom #480
Description
I performed the following operation:
- Merged `origin/master' into my branch on the command line
- Viewed the files in Atom
- Resolved a merge conflict by re-generating the conflicted file
- Added the file and committed on the command line
- Pushed
The following day, when I looked at Atom, the merge commit message was still being shown.
Versions
Atom Version (atom --version):
Atom : 1.14.0-dev-6fb78bd
Electron: 1.3.13
Chrome : 52.0.2743.82
Node : 6.5.0
GitHub Package Version (git --git-dir ~/.atom/packages/github/.git rev-parse head): fbb270e
Activity
kuychaco commentedon May 26, 2017
@BinaryMuse I believe you put in a fix that should've taken care of this? Double-checking to see if that is the case