smart-merge-cli 1.0.0 → 1.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/index.js +0 -0
- package/package.json +4 -1
package/README.md
CHANGED
|
@@ -6,7 +6,7 @@ Your git cli's best friend.
|
|
|
6
6
|
SmartMerge was made from the utter frustration of git merge errors. It is designed to help tracking down those pesky merge errors. It also has a `--json` flag that sends the output to machine readable output. And, it even comes with the `--no-color` flag for no reason at all.
|
|
7
7
|
|
|
8
8
|
## Usage
|
|
9
|
-
To use it, Well you will have to really
|
|
9
|
+
To use it, Well you will have to really screw up your local git repository so much that rebase says `CONFLICT: ` or something. The SmartMerger can help you in this situation by telling you allmost all the info that git dosen't tell you. Because git is a tortuous and insuferable, No. I didn't say that. But anyway, SmartMerger allows you to see commits that are related to the file on your current branch, see an explaination for the curse git gave you and the repo status. Batterys included
|
|
10
10
|
|
|
11
11
|
## Commands
|
|
12
12
|
`
|
package/index.js
CHANGED
|
File without changes
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "smart-merge-cli",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.2",
|
|
4
4
|
"description": "A tool that helps with git merge conflicts",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"git",
|
|
@@ -10,6 +10,9 @@
|
|
|
10
10
|
"author": "gtref",
|
|
11
11
|
"type": "module",
|
|
12
12
|
"main": "index.js",
|
|
13
|
+
"bin": {
|
|
14
|
+
"smartmerge": "./index.js"
|
|
15
|
+
},
|
|
13
16
|
"scripts": {
|
|
14
17
|
"test": "echo \"No Tests\"",
|
|
15
18
|
"lint": "eslint ."
|