kbin-kes icon indicating copy to clipboard operation
kbin-kes copied to clipboard

chore: drop user.js

Open Pamasich opened this issue 9 months ago • 4 comments

This PR removes user.js from anything except kes.user.js. As suggested in #40.

Pamasich avatar Mar 07 '25 11:03 Pamasich

I'm a bit confused by the alleged conflicts here on Github, my local Git says everything is up-to-date with zero conflicts. Does Github just not understand renames correctly?

Pamasich avatar Mar 17 '25 13:03 Pamasich

I'm not actually sure. It might be a bug. Occasionally (rarely) I see synchronization issues. Maybe try making an empty commit and seeing if it updates? If not, could always rescind the PR and submit it again and see if it resolves.

aclist avatar Mar 18 '25 07:03 aclist

Okay, another merge seems to have resolved it for now.

Pamasich avatar Mar 18 '25 07:03 Pamasich

Update: I'm finishing up work on a couple other projects and plan to start revisiting open PRs and pending issues for the next release in the first half of this month.

aclist avatar Apr 01 '25 06:04 aclist

This required another merge from upstream, but conflicts are resolved now. Approving and merging.

aclist avatar Jul 01 '25 22:07 aclist