From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: Lars-Dominik Braun <lars@6xq.net>
Cc: jgart <jgart@dismail.de>, guix-devel@gnu.org
Subject: Re: Python Team: Keeping Branch Up To Date Question
Date: Sat, 09 Sep 2023 08:58:30 -0400 [thread overview]
Message-ID: <87il8jy03t.fsf@gmail.com> (raw)
In-Reply-To: <ZPrOXqIEW_-6rCRZ@noor.fritz.box> (Lars-Dominik Braun's message of "Fri, 8 Sep 2023 09:33:50 +0200")
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
next prev parent reply other threads:[~2023-09-09 12:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-05 2:13 Python Team: Keeping Branch Up To Date Question jgart
2023-09-08 7:33 ` Lars-Dominik Braun
2023-09-09 12:58 ` Maxim Cournoyer [this message]
2023-09-09 17:40 ` jgart
2023-09-09 22:08 ` Maxim Cournoyer
2023-09-10 1:30 ` jgart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87il8jy03t.fsf@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=guix-devel@gnu.org \
--cc=jgart@dismail.de \
--cc=lars@6xq.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.