On Tue, Mar 17, 2009 at 10:58 AM, John Dlugosz <JDlugosz@xxxxxxxxxxxxxxxx> wrote: >> $ git clone git://central/repo.git >> $ cd repo >> $ git checkout -b topic origin/master >> $ edit, commit, edit, commit, looks good >> $ git checkout master >> $ git pull > > You checkout master before updating it? You cannot merge/rebase a branch unless it is checked out. > The developers may not non-ff the dev when they push it. But the repository maintainer may reset dev for some reason, and since topic branches are pushed, he can see that it either doesn't bother anyone that way or knows who to help out. But, it means that in general the pull _could_ be arbitrary and not a ff from his last pull. > > For example, developer A checks in a finished topic, then B checks in a finished topic. But A doesn't use a spell checker even though he *really* should, and doesn't proof read even though he **really** should let a native English speaker look at it first. So the repository maintainer rewrites the tip of the dev branch. Next morning, everyone pulls, and both A and B are non-ff even though they have not branched anything from the old A or B. We seem to not be understanding each other, and I apologize, but I cannot invest any more time in this thread. Perhaps others better understand what you are trying to do and can jump in. j. -- 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
