Geert Janssens <[email protected]> writes:
>> > Conflicts:
>> > packaging/win32/dist-impl.sh
>>
>> What is the "Conflicts" thing?
>>
>> -derek
> Oh, I guess that's a git artefact.
>
> I started with cherry-picking the dist-impl.sh changes from trunk to 2.4, but
> that failed because the files were too different. So I manually edited the
> file in 2.4, but apparently the git commit message still had a comment
> regarding the failed cherry-pick. I hadn't noticed.
>
> The commit itself is clean though, so we can probably ignore this message.
Yeah, I just noticed it's in the log comment. Sorry for the false alarm.
> Geert
-derek
--
Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
Member, MIT Student Information Processing Board (SIPB)
URL: http://web.mit.edu/warlord/ PP-ASEL-IA N1NWH
[email protected] PGP key available
_______________________________________________
gnucash-devel mailing list
[email protected]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
