Troubleshooting

Jump to bottom

Moeen Zamani edited this page Apr 22, 2018 · 2 revisions

Update troubleshooting

Automatic merge failed;

If you encountered Automatic merge failed; upon calling git pull origin master. Please execute:

    git reset --hard origin/master

There was a rebase in Apr 22, 2018 which probably is causing this problem.

Djacket @2018