We've moved discussions to Discord

Join Discord

git merge failing with clean app

Kips Davenport •
Hi Chris Oliver ,

I'm probably doing something wrong but the following commands don't work for me we a clean app using the JSP template.
git fetch jumpstart
git merge jumpstart/master --allow-unrelated-histories
I followed these instructions, cloned my new app locally and then ran the above and i get:

git merge jumpstart/master --allow-unrelated-histories
fatal: Not possible to fast-forward, aborting.

Given this is the advised update method, i was hoping to make sure it worked before i made any changes.

Thanks in advance

K

My Discussions Participating All Discussions
Notifications
You’re not receiving notifications from this thread.