[Slackbuilds-users] Changelog.txt

[Robby Workman]

On Mon, 14 Feb 2022 08:20:00 +1000
Christoph Willing <chris.willing at linux.com> wrote:

> Is the Changelog.txt still supposed to be updated?
> 
> I ask because I'm wondering whether lack of Changelog.txt updates
> might be connected with recent times when I've done 'git pull origin
> master', then being asked to add comment for a merge request. That's
> never happened before (for last few years of updating).
> 
> Now I notice that the most recent entry in the Changelog.txt is Sat
> Apr 17 04:48:35 UTC 2021, yet most recent entry in the git log was
> committed just recently 2022-02-13 09:18:03 +0700.
> 
> So I'm now wondering if these things are connected somehow?


If you get asked to do a merge commit, then something went wrong in your local git checkout. There's almost surely a way to fix it, but when that happens here (it's rare, but it *has* happened a few times in various git repos of which I keep local copies), I just kill the repo and re-clone it.

-RW
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: OpenPGP digital signature
URL: <http://lists.slackbuilds.org/pipermail/slackbuilds-users/attachments/20220214/e4622e87/attachment.asc>