Development discussion of WireGuard
 help / color / mirror / Atom feed
From: Baptiste Jonglez <baptiste@bitsofnetworks.org>
To: Jason@zx2c4.com
Cc: wireguard@lists.zx2c4.com
Subject: Rebasing Wireguard's master branch
Date: Sat, 13 May 2017 09:10:40 +0200	[thread overview]
Message-ID: <20170513071040.GC22218@tuxmachine.polynome.dn42> (raw)

[-- Attachment #1: Type: text/plain, Size: 288 bytes --]

Hi Jason,

Could you please stop rebasing the master branch of the git repository?
It's really annoying (and possibly confusing) to obtain merge conflicts
while simply pulling the latest changes.

If you want to rebase, please use feature branches or something similar.

Thanks,
Baptiste

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

             reply	other threads:[~2017-05-13  6:59 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-13  7:10 Baptiste Jonglez [this message]
2017-06-16  6:13 ` Baptiste Jonglez
2017-06-16 12:18   ` Jason A. Donenfeld

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=20170513071040.GC22218@tuxmachine.polynome.dn42 \
    --to=baptiste@bitsofnetworks.org \
    --cc=Jason@zx2c4.com \
    --cc=wireguard@lists.zx2c4.com \
    /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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).