You might prefer this sequence:
$ git fetch
$ git reset --hard origin/master
___
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
On Sat, May 13, 2017 at 09:10:40AM +0200, Baptiste Jonglez wrote:
> 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.
There you go again: lots
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
