git add and git commit to add the untracked changes and commit them to the new branch.įinally, you can either keep working on the new branch or if you want to go back to branch A, you can execute git checkout A to go back.git merge A to merge the committed changes from branch A to the new branch.Also remember that whatever was committed on branch A will stay there and will not be lost by switching to another branch. Remember that untracked files wont be modified unless they are tracked on the new branch, which from your description I understand they are not. git checkout newBranch to checkout the newly created branch.git branch newBranch master to create a new branch off of master branch.
Additionally, untracked files will not be modified unless they are tracked in the commit / branch you are checking out. There is a new branch B branching off of master, which contains both the committed and untracked changes from branch Aįirst, note: When you use git checkout to checkout a different branch or commit, or when you execute commands that manipulate other branches, whatever was committed on the branch / commit you previously had checked out is not lost, and you can go back to it at any time using git checkout again.I believe the state you are trying to arrive at is the following: The flow in that case would be: git branch newBranch master If you have tracked, but unstaged changes, you should git stash your changes before checking out the new branch, and git stash pop them after merging A into the new branch.įor untracked changes, another way to ensure that they are also stashed and then just apply them to the new branch is to use git stash with the flag -u, which also stashes untracked changes. These are two different things and should be handled differently. Also, I have some files committed and unstaged files in my local feature branch. Currently, I have a master branch (local and remote) and feature branch 'A' (local). In some places you wrote that you had untracked changes, and in some that you had unstaged changes. Create a new branch Ask Question Asked 3 years, 10 months ago Modified 8 months ago Viewed 18k times 3 I want to create new branch, 'B'.
0 kommentar(er)
