Answer by barton for Atom's Git integration not working: merge conflict...
Downgrading from 1.43 to 1.42 seems to have resolved this issue. I would suggest filing a bug report to Atom.https://github.com/atom/atom/blob/master/CONTRIBUTING.md#reporting-bugs
View ArticleAnswer by rob_the_dev for Atom's Git integration not working: merge conflict...
Have you tried adding the project folder to Atom? "File > Add Project Folder..."That might give reference to the .git folder, anyhow it worked for me :)
View ArticleAtom's Git integration not working: merge conflict markers not highlighting
I'm using Github desktop for a Unity project that I'm working on with some class mates. I've been using Atom to merge conflicts because it provides a helpful GUI that highlights each conflict,...
View Article
More Pages to Explore .....
