[Privoxy-devel] Git merges on master (was: what did I do?)

[Fabian Keil]

Lee <ler762 at gmail.com> wrote on 2020-12-14:

> I only did one 'git push' this morning to fix compiler warnings.  I
> don't know how those
>   Lee	Merge branch 'master' of ssh://git.privoxy.org:23/git...
> entries got created unless it was my normal get the latest changes process:
> 
>   git checkout master  -- to get back to the "master" branch
>   git pull                     -- get the latest source
>   git checkout lee       -- get back to my branch

This looks reasonable so far.

>   git merge master     -- merge the latest changes into my branch

For the future I'd recommend that you use "git rebase master" instead.
 
> but I've never noticed anything showing up on privoxy.org/gitweb/ before.
>
> Did I actually change anything & if so, how do I undo it?

It looks like you indeed pushed merge commits although I
think this required additional steps ...

I think with the right git commands involving "git push --force"
we could remove them again but this will inconvenience everyone who
already pulled.

Reverting 867cd1d8 (if it should not be in master yet) will
keep the somewhat ugly history but is probably sufficient.

Fabian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.privoxy.org/pipermail/privoxy-devel/attachments/20201214/800286b0/attachment.bin>