Re: Python Team: Keeping Branch Up To Date Question

[Maxim Cournoyer]

Hi,

Lars-Dominik Braun <lars@6xq.net> writes:

> Hi,
>
>> What is the git approach for keeping the Python branch up to date? 🦆
>> Should I be rebasing off of master or something else?
>
> yeah, that’s generally what I would do before working on it. Note that
> you cannot force-push into Savannah. You have to remove the remote branch
> and create it again.

I'd like to add that unless you are the only person pushing on a branch,
delete and recreate with a rewritten history is not a good idea (it'll
force every other contributors to notice and 'git fetch && git reset
--hard your-team-branch', which is impolite).

When multiple people are actively contributing to the same branches, the
branch history already published shouldn't be rewritten -- which means
master should be merged into the team branch rather than the team branch
rebased on master.

-- 
Thanks,
Maxim