From 21fa1b581925605f924b02c75b4d620e18e989e2 Mon Sep 17 00:00:00 2001 From: kcdtv Date: Wed, 21 Jun 2017 04:18:19 +0200 Subject: [PATCH] FAQ --- FAQ.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 FAQ.md diff --git a/FAQ.md b/FAQ.md new file mode 100644 index 0000000..fa6907b --- /dev/null +++ b/FAQ.md @@ -0,0 +1,13 @@ +Welcome to the reaver-wps-fork-t6x 1.6b wiki! + +![](http://pix.toile-libre.org/upload/original/1498011423.png) + +**What to do if I cannot merge this repository when I do git pull?** + + In case you get merge errors when doing git pull, try the following steps +`git merge --abort` +`git fetch off` (where off is the name of the upstream repo) +`git branch -m master master-old_local` (rename your master branch to master-old_local) +`git checkout off/master` +`git checkout -b master` +... and you have current master