Could not switch from Snipa22 xmr-node-proxy repository

[mpenagar]

~/xmr-node-proxy$ git remote set-url origin https://github.com/MoneroOcean/xmr-node-proxy.git && git pull
From https://github.com/MoneroOcean/xmr-node-proxy
 + 238cf5e...591f397 master     -> origin/master  (forced update)
Auto-merging proxy.js
CONFLICT (content): Merge conflict in proxy.js
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Auto-merging lib/xmr.js
CONFLICT (content): Merge conflict in lib/xmr.js
Automatic merge failed; fix conflicts and then commit the result.

[MoneroOcean]

Try to do git reset --hard && git remote set-url origin https://github.com/MoneroOcean/xmr-node-proxy.git && git pull && npm update"

[mpenagar]

Same:

~/xmr-node-proxy$ git reset --hard
HEAD is now at 238cf5e Update with new Cryptonight-Hashing library + the required changes for XMR.  Thanks to Mayday30/MoneroOcean for getting an updated lib together.
~/xmr-node-proxy$ git remote set-url origin https://github.com/MoneroOcean/xmr-node-proxy.git
~/xmr-node-proxy$ git pull
Auto-merging proxy.js
CONFLICT (content): Merge conflict in proxy.js
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Auto-merging lib/xmr.js
CONFLICT (content): Merge conflict in lib/xmr.js
Automatic merge failed; fix conflicts and then commit the result.

I could try to mimic the "green-field install" script install.sh, changing the directory name "xmr-node-proxy" to avoid colision with the Snipa22 directory, and install it from scratch.

[MoneroOcean]

Yes, you can erase xmr-nody-proxy dir (keep config.json if you need it) and do full install again. It should help with local changes.

[mpenagar]

I think I got it. I reverted back to commit 03e3ed2 (two commits back) of Snipa22 repository:

git reset --hard 03e3ed2

and then the switch worked:

git remote set-url origin https://github.com/MoneroOcean/xmr-node-proxy.git && git pull && npm update

Thanks!!

[MoneroOcean]

You are welcome!