![]() perhaps a little explanation about how branches work in git will help understand what is happening. So, plan ahead, let people know about it (usual means: mails, meetings, you name it).Ībout point 3, they go nowhere. nor getting flooded with questions if you are the person in charge of the repo. it's not like it is the end of the world if you are not in sync, but if you do not tell people about it, then seeing a new feature branch show up in the central repo should not come as a surprise. That should be enough so that when the pull, they do not get the error about the missing branch.Ībout point 2: Any means necessary. Git branch -set-upstream-to=origin/beta $branch Upstream=$(git rev-parse -abbrev-ref then ![]() Perhaps something like: git branch | for each branch do This might be simpler to do by using a script that checks their upstream of all local branches. On each local branch that was using feature. This can be easily done with git branch -set-upstream-to=origin/beta some-local-branch Then, they need to set up all the branches that are using origin/feature to use origin/beta as their upstream. If they want to delete the local one, they need to run git branch -D feature. That won't delete their local feature branch, if they have one (I for one do not create local branches for shared branches). It shouldn't be too difficult for them to correct the situation.įirst, they should fetch with -prune so that the remote feature branch goes away from what they see about the remote: git fetch -prune origin # or adjust to the remote that each one likes to name it I hope your team was in sync about this branch renaming.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |