smashwilson / merge-conflicts

Resolve git merge conflicts in Atom
https://atom.io/packages/merge-conflicts
MIT License
432 stars 42 forks source link

Support custom project path for conflict detection #271

Closed yanfeng42 closed 1 year ago

yanfeng42 commented 7 years ago

Support custom project path for conflict detection And To be compatible with the case where the path may be git root path.

Give other package author the ablity to programmed detection confilct.

usage:

atom.packages.getActivePackage('merge-conflicts').mainModule.detect(someGitRepoPath)