> $ 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?
> $ git merge topic
> $ compile, test, etc
> $ git push origin master (2)
> $ git branch -d topic
> So this way git://central/repo.git/refs/heads/master is never reset.
> But, if you do have a valid reason for resetting, then what I said in
> my previous message still applies.
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.
> Rarely, I'll base a topic on origin/pu. And origin/pu might get reset.
> But even if it were, I wouldn't want to blindly reset my local branch
> to match, thus losing my local changes. Instead I'd do this:
The local changes are all on a topic. Daily routine is to fetch and probably rebase topics each morning. Nobody checks out dev except to post a completed topic.
--John
TradeStation Group, Inc. is a publicly-traded holding company (NASDAQ GS: TRAD) of three operating subsidiaries, TradeStation Securities, Inc. (Member NYSE, FINRA, SIPC and NFA), TradeStation Technologies, Inc., a trading software and subscription company, and TradeStation Europe Limited, a United Kingdom, FSA-authorized introducing brokerage firm. None of these companies provides trading or investment advice, recommendations or endorsements of any kind. The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from any computer.��.n��������+%������w��{.n��������n�r������&��z�ޗ�zf���h���~����������_��+v���)ߣ�m
