Øyvind Harboe wrote: > >> - correct master branch and force a push to the master branch > > > > Better avoid rebasing master. Not that it's forbidden, but git and > > others assume there will be no publically visible rebases. > > How and where does git assume this?
push, merge and rebase (locally) will complain if a remote repo has been rebased. It's simple enough to override the complaint with -f to each respective git command, and if someone has local changes on top of what used to be master they will then need to rebase their work onto what is now master. I'm less strict about public rebasing than at least some others, but I think at least for a master repo it's a good thing to avoid it. > A tag would make that branch publicly visible, so a user would > find himself working on top of a tag instead of the master branch. > > He can then merge or rebase on top of master branch easily. Hmm - I don't think I understand what you mean. Sorry. :\ Can you show a simple case? //Peter _______________________________________________ Openocd-development mailing list [email protected] https://lists.berlios.de/mailman/listinfo/openocd-development
