Hello everyone, I have a few questions about the workflow we sue at work. On one of our project, we depend on an external source which uses git. On our side of the project, we create some patches (this part is not the problem), but only some of them are intended to be pushed (ie pulled by) the external source. So basically, we have a set of patches on local branch that we rebase every so and then against master to keep our version up-to-date with the external one. Is this the right way to do it? Then, internally we have a centralized repository and many personal ones. When the need to go to the next version, one of the developper rebases the company patches branch afaisnt master and push it into the centralized repo. What is the best way for the other developpers to get up-to-date with the rebased branch? git pull --rebase seems to me like a good way to keep local modifications. If all our patches were already pushed on the centralized repo, we tend top use git reset --hard origin/our_patches Final question: I noticed that when the branch was rebased on the centralized and repo and origin/our_patches is up-to-date in mine. If I checkout another branch and then ckecout our_branches, I got a message telling my our_patches and the one from the server have diverged (or you are two commits behind...). How can you get this info directly without leaving/rejoining your branch? Regards Nicolas -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
