Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge conflict code. #69

Open
neerajsachan opened this issue Nov 18, 2016 · 0 comments
Open

Merge conflict code. #69

neerajsachan opened this issue Nov 18, 2016 · 0 comments

Comments

@neerajsachan
Copy link
Collaborator

neerajsachan commented Nov 18, 2016 •
edited

Usage the apm plugin merge-conflict for resolving git merge conflicts in Atom . For reference follow the link https://atom.io/packages/merge-conflicts .
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@neerajsachan