<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<div markdown-here-wrapper-content-modified="true" style=""
data-md-original="%3Cdiv%20class%3D%22moz-cite-prefix%22%3EOn%2004%2F17%2F2014%2001%3A21%20PM%2C%20Tom%20Clegg%20wrote%3A%3Cbr%3E%3C%2Fdiv%3E%3Cblockquote%20cite%3D%22mid%3ACAOtdHJEdcxqwSCwMJfXsd02UpPoWz0vOTn8QM-n%2BgJqZdiRQTA%40mail.gmail.com%22%20type%3D%22cite%22%3E%3Cpre%20wrap%3D%22%22%3EOne%20possibility%20on%20the%20%22rebase%22%20topic%3A%20create%20a%201234-feature-rebased%0Abranch%2C%20rebase%20that%20from%20master%2C%20then%20push%20it.%20This%20avoids%20encouraging%0Aany%20%22pull%20-f%22%20habits%2C%20and%20makes%20it%20explicit%20that%20you%20rebased.%20You%20can%0Athen%20delete%20the%20original%20branch%20from%20remote%2C%20to%20make%20it%20less%20likely%0Asomeone%20will%20accidentally%20pull%20your%20old%20branch%20because%20they%20don't%0Anotice%20your%20new%20one.%3C%2Fpre%3E%3C%2Fblockquote%3EIf%20people%20don't%20mind%2C%20I'll%20probably%20start%20trying%20this%2C%20except%20in%20reverse%3A%20I'll%20build%20the%20work%20in%20a%20branch%20%221234-branch-name-wip%22
%20(%22wip%22%20is%20short%20for%20%22work%20in%20progress%2C%22%20and%20having%20it%20at%20the%20end%20of%20branch%20name%20is%20a%20convention%20in%20some%20git%20workflows)%2C%20then%20publish%20a%20rebased%20version%20in%20%221234-branch-name%22.%3Cbr%3E%3Cbr%3E%3Cbr%3E"
class="markdown-here-wrapper" data-md-url="null"
id="markdown-here-wrapper-286380">
<p style="margin: 1.2em 0px ! important;">On 04/17/2014 01:21 PM,
Tom Clegg wrote:</p>
<p style="margin: 1.2em 0px ! important;"></p>
<div class="markdown-here-exclude">
<p></p>
<blockquote
cite="mid:CAOtdHJEdcxqwSCwMJfXsd02UpPoWz0vOTn8QM-n+gJqZdiRQTA@mail.gmail.com"
type="cite">
<pre wrap="">One possibility on the "rebase" topic: create a 1234-feature-rebased
branch, rebase that from master, then push it. This avoids encouraging
any "pull -f" habits, and makes it explicit that you rebased. You can
then delete the original branch from remote, to make it less likely
someone will accidentally pull your old branch because they don't
notice your new one.</pre>
</blockquote>
<p></p>
</div>
<p style="margin: 1.2em 0px ! important;"></p>
<p style="margin: 1.2em 0px ! important;">If people don’t mind,
I’ll probably start trying this for my own work, except in
reverse: I’ll build the work in a branch “1234-branch-name-wip”
(“wip” is short for “work in progress,” and having it at the end
of branch name is a convention in some git workflows), then
publish a rebased version in “1234-branch-name”. And I can
report on how it goes after some experience with it.<br>
</p>
</div>
<div class="moz-signature markdown-here-signature">-- <br>
Brett Smith</div>
</body>
</html>