tyler.durden/reaver-wps-fork-t6x
1
0
Fork 0
mirror of https://github.com/t6x/reaver-wps-fork-t6x.git synced 2025-09-25 02:57:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

FAQ

kcdtv 2017-06-21 04:18:19 +02:00
parent 640e3e9d37
commit 21fa1b5819
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
FAQ.md Normal file

@ -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