Git workflow for addons.mozilla.org

I like some of this, but I worry about rebasing that often after pushing. I understand the benefit of keeping the history cleaner, but it also means if any features <i>are</i> worked on by multiple people it would become impossible to use git's best feature of auto merging things.<p>What do you do when feature work is long standing and worked on by multiple people?

If you incorporate this with good deploy scripts, it becomes rather convenient to test topic branches in different environments. No more dev/stage/prod branches, just branch off master, test and deploy the topic branch to an environment, and merge it back in to master when it's ready to live in production. I believe this is what Github does internally.

<p><pre><code> sync = "!f() { echo Syncing $1 with master &#38;&#38; git checkout master &#38;&#38; git pull &#38;&#38; git checkout $1 &#38;&#38; git rebase master; }; f" </code></pre> I believe this is equivalent to (from topic branch)<p><pre><code> sync = "git pull --rebase origin master"</code></pre>

I believe the "fix" shell command is just<p><pre><code> git commit --amend</code></pre>