There are reverted commits in the git.git repository. To answer your question simply: you should accept that sometimes there will be mistakes in your history. (If they were resolved, and the result was pushed back into the repository, you'd be in an even worse state - both versions of history there.) Given what you're trying to do here, the merge would have conflicts. Other users attempting to pull while master does not exist will simply have their pulls fail (no such ref on remote), and once it exists again in a new place, their pulls will have to attempt to merge their master with the new remote master, just as if you merged master-old and master-new in your repository. It does not matter how you get into a state in which master is not a descendant of a previous position of master, simply that it is in that state. That is, master-new will not contain master-old in its history.* If you call master-new "master", you will effectively have rewritten history. I'm assuming you're still asking about the same situation as in your previous question. this is done by doing a merge commit with "ours" strategy which obsoletes using a sensible merge commit message: renamed branch "master" to "master-old" and use commit ba2f9cc as new "master" This works because creating a merge commit allows fast-forwarding the branch to a new revision. # "master-old" hence the "ours" strategy. # this works even if you are on branch "master"Ĭreating the new "master" branch: # create master from new starting pointĬreating a merge commit to have a parent-child history: # now we've got to fix the new branch. renaming the branch: # rename the branch "master" to "master-old" The whole idea hinges on merge commits as they allow fast-forward, and link histories of a branch with another. This is something actually easy to do but don't abuse it. There are many ways to rename the branch, but I am going to focus on the bigger problem: "how to allow clients to fast-forward and not have to mess with their branches locally". This caveat only applies to the current branch (usually the master branch) any other branch can be deleted and recreated as above. Note that if you're not able to change the remote's configuration, you won't be able to completely delete the master branch! Otherwise, if you're ready to create a new master right away, skip the git push remote :master step, and pass -force to the git push remote master step. You can override this by setting the nyDeleteCurrent configuration value to warn or ignore on the remote repository. Note: Newer versions of Git will not allow you to delete the master branch remotely by default. So it's generally a bad idea unless you have the cooperation of everyone who has checked out the repository previously. the pull will attempt to merge master and master-old. If the new master doesn't exist yet, git pull will error out.
First, no existing checkouts will know about the rename - Git does not attempt to track branch renames. Git push remote master # Create master on remote Git checkout -b master some-ref # Create a new local master Git push remote master-old # Create master-old on remote For example: git branch -m master master-old “old” is the name of the branch you want to rename and “new” is the new name for the branch.The closest thing to renaming is deleting and then recreating on the remote. The git branch command lets you rename a branch. You can learn more about Git branches in our git branch tutorial. Git may be annoying at times but it does have a method that you can use to rename a branch. What happens if a branch is named incorrectly? Do you need to delete it? No. A branch lets you work on different parts of a project without having to affect the main line of development. Without further ado, let’s begin! Git Branchesīranches are independent lines of development in a Git repository. We’ll walk though an example of renaming a local and remote branch to help you get started.
#Git rename remote branch how to
In this tutorial, we’re going to talk about how to rename a Git branch. Access exclusive scholarships and prep coursesīy continuing you agree to our Terms of Service and Privacy Policy, and you consent to receive offers and opportunities from Career Karma by telephone, text message, and email.Career Karma matches you with top tech bootcamps.
0 kommentar(er)
