将提交从一个分支移动到 GitHub 中的另一个分支？

Question

I've got two branches on a repo in GitHub; one is the default branch master , and the other is called gh-pages . I set the default branch to be gh-pages on GitHub.

I use VS Code Editor to code my project ( coder-in-pink ), so I created a new branch named gh-pages in VS Code, and I committed my saved work in the source control.

I'm not allowed to embed pictures in my posts yet, so here's the little picture of the gh-pages branch I set in VS Code . (It might not be very helpful, though.)

But today I found out that it had been committed to the master branch. How do I move/transfer it to the gh-pages branch?

Thanks!

PS I'm planning to make the website with HTTPS and a custom domain afterwards, which is why I want to use the gh-pages branch.

Here's the link to my repo on GitHub => Coder In Pink .

Answer 1

Here's what I would do

1. Merge master to gh-pages - this would bring the commit to gh-pages .

2. Revert the commit in master , if needed, by git revert commit-id .

---

Update

I found this by coincidence.

The GitHub Blog's How to undo (almost) anything with Git has a section that matches your scenario.

Once more, with branching

Scenario : You made some commits, then realized you were checked out on master. You wish you could make those commits on a feature branch instead.

(...)

Answer 2

git checkout gh-pages This makes sure you're on the gh-pages branch

git merge master This merges master into gh-pages

Finally git push origin gh-pages This will push your changes back to GitHub. Origin isn't needed, but this is the long-form way of doing it.

The short way is just git push while being checked out on gh-pages