[Privoxy-devel] Merge commits

[Fabian Keil]

Lee <ler762 at gmail.com> wrote on 2021-03-22:

> On 3/22/21, Fabian Keil <fk at fabiankeil.de> wrote:
> > Lee <ler762 at gmail.com> wrote on 2021-03-22:
> >
> >> On 3/22/21, Fabian Keil <fk at fabiankeil.de> wrote:

> >> > How do you copy changes over?
> >>
> >> With winmerge - it makes it easy to copy changes over as just <these>
> >> lines or the whole block of changed code.  It's a "visual diff"
> >> program like meld (meldmerge.org) but better.
> >
> > It sounds like this should work without merge commits as well
> > when done on a clean master branch that is in sync with the
> > remote.
> 
> In other words, if I do a 'git pull' before making any changes and
> 'git commit -a; git push' after making my changes I should be good.
> Correct?

Correct, provided you start with a clean local master branch.

I'd still recommend checking the "git log -p origin/master.." output
before pushing anything, though.

Also polishing your patches first and then applying the polished
patches with "git am" on top of a clean local master branch seems
more convenient and less error-prone to me.

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/20210322/acbb2b73/attachment.bin>