[arvados-dev] Brett's opinions on git workflow

[Brett Smith]

On 04/17/2014 01:21 PM, Tom Clegg wrote:

> 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.

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.

-- 
Brett Smith
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.arvados.org/pipermail/arvados-dev/attachments/20140418/9dac7f24/attachment-0001.html>