I forked the nextjs frontend an worked on the fork.
Now after the releases of version 0.8.5 I wanted to merge the changes into my forked repo.
Due to merge-conflicts I had to create a pull request - what I did.
Then I followed the instructions on GitHub:
Step 1: From your project repository, check out a new branch and test the changes.
git checkout -b enonic-master master
git pull https://github.com/enonic/nextjs-enonic-demo.git master
Step 2: Merge the changes and update on GitHub.
git checkout master
git merge --no-ff enonic-master
git push origin master
This was successful - so far as I could see- but on my repo I get the following message now:
How can I fix this ? or What did I wrong?