Terry, we deleted newProject.xpr from my local repo, and I haven't staged or committed it b/c I don't know the ramifications of doing so. Should I just do so? thanks for your help
Try a git pull --rebase and we'll see what happens.
I did that several times, but I get the error msg: error: cannot pull with rebase: You have unstaged changes. error: please commit or stash them.
It's only that "newProject.xpr" deletion that I haven't staged or committed
Try git stash. That will make git ignore whatever local changes you have so you can pull.
On Fri, Sep 28, 2018, 09:54 Pamela Smith notifications@github.com wrote:
I did that several times, but I get the error msg: error: cannot pull with rebase: You have unstaged changes. error: please commit or stash them.
— You are receiving this because you were assigned. Reply to this email directly, view it on GitHub https://github.com/cu-mkp/m-k-manuscript-data/issues/18#issuecomment-425443026, or mute the thread https://github.com/notifications/unsubscribe-auth/AA7A8kyk6n2-porleBRQbKNyj6AFnf_sks5ufioIgaJpZM4W-bBu .
worked thanks.