Home / Questions / 77231
Accepted
gmarsi
Asked: 2020-06-10 02:53:52 +0800 CST 2020-06-10 02:53:52 +0800 CST

Can changes be pushed from one branch to another in Git?

  • 772

I've only recently started using Git and I have a bad habit of starting programming without first creating a new branch. That is, I modify the code directly from the branch master.

Can changes made in one branch be moved to another and thus leave the branch masterclean?

git

2 Answers

  1. Best Answer

    If possible.

    If you haven't done any yetcommit

    Right now you are in master. If you type you git statuswill see a list of files that have been modified but not committed .

    Just create the branch:

    git checkout -b nueva_rama

    This command creates it and automatically takes you to it, taking all those changes with it.
    Indeed, if you do it git statusagain you will see those changes appear there, so doing a commitwill push them to that branch nueva_rama, not to master.

    If you have already donecommit

    In this case, it will have to be undone first. As read in How can I undo the last commit in Git? , uses:

    git reset HEAD~1

    or more times if there are more commits. From that moment on, git statusit will show those changes again in "uncommitted" status.

    So we are back to the previous point If you haven't done any yetcommit , so follow those steps.

    You should also keep in mind that masteryou will have quite a few commits to undo. Therefore, you must return to the previous state by doing git checkout <número del último commit válido>.

    • 16

  2. If you have thrown a few commits in master, what you have to do is simply create the branch with git checkout -b nueva_ramaas the other answers say, if you have any change without committing it commit, stashthen you return to your branch masterwith git checkout master, they look for git logwhich one it is with commit to which the branch mastershould be, and you switch to master with git reset --hard commit_hash. You should be left with your new branch with the commits you wanted and your master branch behind it without the commits.

    If you haven't pulled any commits you just have to create the branch and commit your changes

    If the branch already exists you can do a git rebase https://git-scm.com/docs/git-rebase and then stop at master and do a git reset --hardlike in the first example

    • 3