search

jeffreytse / jekyll-deploy-action

🪂 A Github Action to deploy the Jekyll site conveniently for GitHub Pages.
MIT License
344 stars 47 forks source link

failed: "It's conflicted to deploy on same branch master" #61

Closed infominer33 closed 1 year ago

infominer33 commented 1 year ago

deployment failed: "It's conflicted to deploy on same branch master"

no good reason for me to deploy to a different branch, actually makes my job a lot more complicated when the build command changes only a few files in the _site directory

Over the years, I've have websites using a variety of frameworks from Hugo to Jekyll and a variety of others, deploying to the same branch as I'm building from has been a problem only this time.

infominer33 commented 1 year ago

it appears this is unrelated to your action, but a systemwide behavior I haven't encountered, yet.

the solution is simple enough to clone the gh-pages branch and serve from there... just confusing to get here