oldmonad · June 16, 2022 21:34 · Mar 17, 2022 · Mar 17, 2022 · Mar 17, 2022 · Mar 17, 2022
diff --git a/package-lock-conflicts.md b/package-lock-conflicts.md
@@ -27,7 +27,7 @@ It is not possible to resolve conflicts of package-lock.json in GitHub's merge t
     npm install
     ```
 1. "Test drive" your application to make sure the conflicts in `package.json` have been resolved correctly.
-1. If the application is starting (i.e. there are no missing dependencies), add all changes and finish the merge:
+1. If the application is able to start up (i.e. there are no missing dependencies), add all changes and finish the merge:
     ```
     git add --update
     git commit

diff --git a/package-lock-conflicts.md b/package-lock-conflicts.md
@@ -26,10 +26,7 @@ It is not possible to resolve conflicts of package-lock.json in GitHub's merge t
     ```
     npm install
     ```
-1. "Test drive" your application to make sure the conflicts in `package.json` have been resolved correctly:
-    ```
-    npm start
-    ```
+1. "Test drive" your application to make sure the conflicts in `package.json` have been resolved correctly.
 1. If the application is starting (i.e. there are no missing dependencies), add all changes and finish the merge:
     ```
     git add --update

diff --git a/package-lock-conflicts.md b/package-lock-conflicts.md
@@ -20,12 +20,16 @@ It is not possible to resolve conflicts of package-lock.json in GitHub's merge t
     Automatic merge failed; fix conflicts and then commit the result.
     ```
 1. Open your editor (e.g. VSCode) and:
-    * Carefully resolve any conflict in `package.json`.
-    * Ignore the conflicts in `package-lock.json`.
+    * Carefully resolve any conflict in `package.json`
+    * Ignore the conflicts in `package-lock.json`
 1. Install packages, which will re-generate `package-lock.json`:
-    ```npm install```
+    ```
+    npm install
+    ```
 1. "Test drive" your application to make sure the conflicts in `package.json` have been resolved correctly:
-    ```npm start```
+    ```
+    npm start
+    ```
 1. If the application is starting (i.e. there are no missing dependencies), add all changes and finish the merge:
     ```
     git add --update

diff --git a/package-lock-conflicts.md b/package-lock-conflicts.md
@@ -19,7 +19,7 @@ It is not possible to resolve conflicts of package-lock.json in GitHub's merge t
     CONFLICT (content): Merge conflict in package.json
     Automatic merge failed; fix conflicts and then commit the result.
     ```
-1. Open VS code and:
+1. Open your editor (e.g. VSCode) and:
     * Carefully resolve any conflict in `package.json`.
     * Ignore the conflicts in `package-lock.json`.
 1. Install packages, which will re-generate `package-lock.json`:

diff --git a/package-lock-conflicts.md b/package-lock-conflicts.md
@@ -1,6 +1,6 @@
 # How to resolve package-lock.json conflicts
 
-It is not possible to resolve conflicts of package-lock.json in GitHub and you need to do a manual merge.
+It is not possible to resolve conflicts of package-lock.json in GitHub's merge tool and you need to do a manual merge.
 
 1. Update the `main` branch with the latest changes:
     ```

diff --git a/package-lock-conflicts.md b/package-lock-conflicts.md
@@ -3,36 +3,36 @@
 It is not possible to resolve conflicts of package-lock.json in GitHub and you need to do a manual merge.
 
 1. Update the `main` branch with the latest changes:
-  ```
-  git checkout main
-  git pull
-  ```
+    ```
+    git checkout main
+    git pull
+    ```
 1. Merge your feature branch into `main`:
-  ```
-  git merge mybranch
-  ```
-  You will see something like the following message:
-  ```
-  Auto-merging package-lock.json
-  CONFLICT (content): Merge conflict in package-lock.json
-  Auto-merging package.json
-  CONFLICT (content): Merge conflict in package.json
-  Automatic merge failed; fix conflicts and then commit the result.
-  ```
+    ```
+    git merge mybranch
+    ```
+    You will see something like the following message:
+    ```
+    Auto-merging package-lock.json
+    CONFLICT (content): Merge conflict in package-lock.json
+    Auto-merging package.json
+    CONFLICT (content): Merge conflict in package.json
+    Automatic merge failed; fix conflicts and then commit the result.
+    ```
 1. Open VS code and:
-  * Carefully resolve any conflict in `package.json`.
-  * Ignore the conflicts in `package-lock.json`.
+    * Carefully resolve any conflict in `package.json`.
+    * Ignore the conflicts in `package-lock.json`.
 1. Install packages, which will re-generate `package-lock.json`:
-  ```npm install```
+    ```npm install```
 1. "Test drive" your application to make sure the conflicts in `package.json` have been resolved correctly:
-  ```npm start```
+    ```npm start```
 1. If the application is starting (i.e. there are no missing dependencies), add all changes and finish the merge:
-  ```
-  git add --update
-  git commit
-  ```
-  (Make sure not to commit the `*.orig` files!)
+    ```
+    git add --update
+    git commit
+    ```
+    (Make sure not to commit the `*.orig` files!)
 1. If everything looks fine, push to GitHub:
-  ```
-  git push
-  ```
+    ```
+    git push
+    ```
diff --git a/package-lock-conflicts.md b/package-lock-conflicts.md
@@ -0,0 +1,38 @@
+# How to resolve package-lock.json conflicts
+
+It is not possible to resolve conflicts of package-lock.json in GitHub and you need to do a manual merge.
+
+1. Update the `main` branch with the latest changes:
+  ```
+  git checkout main
+  git pull
+  ```
+1. Merge your feature branch into `main`:
+  ```
+  git merge mybranch
+  ```
+  You will see something like the following message:
+  ```
+  Auto-merging package-lock.json
+  CONFLICT (content): Merge conflict in package-lock.json
+  Auto-merging package.json
+  CONFLICT (content): Merge conflict in package.json
+  Automatic merge failed; fix conflicts and then commit the result.
+  ```
+1. Open VS code and:
+  * Carefully resolve any conflict in `package.json`.
+  * Ignore the conflicts in `package-lock.json`.
+1. Install packages, which will re-generate `package-lock.json`:
+  ```npm install```
+1. "Test drive" your application to make sure the conflicts in `package.json` have been resolved correctly:
+  ```npm start```
+1. If the application is starting (i.e. there are no missing dependencies), add all changes and finish the merge:
+  ```
+  git add --update
+  git commit
+  ```
+  (Make sure not to commit the `*.orig` files!)
+1. If everything looks fine, push to GitHub:
+  ```
+  git push
+  ```
No results found