Re: [lmi] [lmi-commits] valyuta/005 7454e60 4/6: Import various improvements from 'master'

[Vadim Zeitlin]

On Mon, 25 Jan 2021 12:11:02 -0500 (EST) Greg Chicares 
<gchicares@sbcglobal.net> wrote:

GC> branch: valyuta/005
GC> commit 7454e60867ca84c755bdec1c23bce3ebe93bc263
GC> Author: Gregory W. Chicares <gchicares@sbcglobal.net>
GC> Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
GC> 
GC>     Import various improvements from 'master'
GC>     
GC>     This "merge" was done manually, without git-merge, because repeating
GC>     minor changes was a good way to make sure they're correct and complete.

 Just FYI, it's quite possible to do such merges manually while still
recording them as a merge for Git (i.e. a commit with 2 parents) in order
to make automatic merges (or many other operations, such as git-blame) work
correctly in the future. As it is, you would get conflicts for any changes
not done _exactly_ in the same way in both branches if you try to merge
later. Of course, you might not care about this, at least now, but OTOH it
doesn't really cost anything to make a "real" merge neither.

 Regards,
VZ

pgpzeg_REmD90.pgp
Description: PGP signature