Sadly, It’s private repo with big secure data. So I can’t share.
I did pull from console and got this error:
remote: Counting objects: 100% (81/81), done.
remote: Compressing objects: 100% (48/48), done.
remote: Total 740 (delta 37), reused 65 (delta 28), pack-reused 659
Receiving objects: 100% (740/740), 2.97 MiB | 1.52 MiB/s, done.
Resolving deltas: 100% (450/450), completed with 7 local objects.
* branch HEAD -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
Please, commit your changes or stash them before you can merge.
error: The following untracked working tree files would be overwritten by merge:
Please move or remove them before you can merge.
“shrinkwrap.yml” is not my file and I have no idea why this file created.
Anyhow, I’ve manually delete 2 files and could pull.
When pulling, text editor opened automatically. There was some text about merge thingy. (I don’t remember)
I recommend show pull/merge error message to user,
Instead of “arg, something went wrong. Try again? :@”
This happened again after pull manually.
Pull & merge function seems like not work well.
– Additional 2
After manual pull, some file is missing so I’ve manually add it using “New File” menu.