Re: Another git question

[Achim G. <Str...@ne...>]

Ethan A Merritt via gnuplot-beta writes:
> Unfortunately (4) will never work as-is because the ChangeLog is
> very different between the two branches.  On the other hand I know
> that the modification to the ChangeLog is always at the top,
> so I edit the formatted patch as I showed so that the ChangeLog diffs
> refer specifically to the top of the file.

There are specialized merge drivers for ChangeLog files and similar
things you can tell git to use that use those peculiarities to produce
less merge conflicts.

> Is there some totally different recommended way to replicate
> changes previously made to one branch and apply them to a 
> different branch?

What's wrong with cherry-pick, specifically the form that uses a range
expression for the commits?  If the changes are already in the repo, I
never bother with git format-patch / am.


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

SD adaptations for Waldorf Q V3.00R3 and Q+ V3.54R2:
http://Synth.Stromeko.net/Downloads.html#WaldorfSDada