From e1b44482a7d3774be909581790a2b1e953fc3cea Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Fri, 24 Mar 2017 20:38:58 +0100
Subject: [PATCH] Install methods

---
 docs/install.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/docs/install.md b/docs/install.md
index 1274ed84..7c383a63 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -49,8 +49,10 @@ The database will be initialized right after a connection to MySQL can be establ
 
 ## Update mailcow
 
-There is no update routine. You need to refresh your pulled repository clone and apply your local changes (if any). Actually there are many ways to merge local changes. Here is one to
-stash all local changes, pull changes from the remote master branch and apply your stash on top of it. You will most likely see warnings about non-commited changes; you can ignore them:
+There is no update routine. You need to refresh your pulled repository clone and apply your local changes (if any). Actually there are many ways to merge local changes.
+
+### Step 1, method 1
+Stash all local changes, pull changes from the remote master branch and apply your stash on top of it. You will most likely see warnings about non-commited changes; you can ignore them:
 
 ```
 # Stash local changes
@@ -61,6 +63,49 @@ git pull
 git stash pop
 ```
 
+### Step 1, method 2
+Fetch new data from GitHub, commit changes and merge remote repository: 
+
+```
+# Get updates/changes
+git fetch
+# Add all changed files to local clone
+git add -A
+# Commit changes, ignore git complaining about username and mail address
+git commit -m "Local config aat $(date)"
+# Merge changes
+git merge
+```
+
+If git complains about conflicts, solve them! Example:
+```
+CONFLICT (content): Merge conflict in data/web/index.php
+```
+
+Open `data/web/index.php`, solve the conflict, close the file and run `git add -A` + `git commit -m "Solved conflict"`.
+
+### Step 1, method 3
+
+Thanks to fabreg @ GitHub!
+
+In case both methods do not work (for many reason like you're unable to fix the CONFLICTS or any other reasons) you can simply start all over again.
+
+Keep in mind that all local changes _to configuration files_ will be lost. However, your volumes will not be removed.
+
+- Copy mailcow.conf somewhere outside the mailcow-dockerized directory
+- Stop and remove mailcow containers: `docker-compose down`
+- Delete the directory or rename it
+- Clone the remote repository again (`git clone https://github.com/andryyy/mailcow-dockerized && cd mailcow-dockerized`). **Pay attention** to this step - the folder must have the same name of the previous one!
+- Copy back your previous `mailcow.conf` into the mailcow-dockerizd folder 
+
+If you forgot to stop Docker before deleting the cloned directoy, you can use the following commands:
+```
+docker stop $(docker ps -a -q)
+docker rm $(docker ps -a -q)
+```
+
+### Step 2
+
 Pull new images (if any) and recreate changed containers:
 
 ```
@@ -68,6 +113,7 @@ docker-compose pull
 docker-compose up -d --remove-orphans
 ```
 
+### Step 3
 Clean-up dangling (unused) images and volumes:
 
 ```