search

PolicyEngine / policyengine-app

PolicyEngine's free web app for computing the impact of public policy.
GNU Affero General Public License v3.0
32 stars 86 forks source link

Rename "Collapsable" to "Collapsible" #1705

Closed psankhe28 closed 1 week ago

psankhe28 commented 2 weeks ago

Description

1693

Changes

Rename "Collapsable" to "Collapsible"

Tests

17/17 passed

psankhe28 commented 2 weeks ago

@anth-volk Please review this. Thanks

anth-volk commented 1 week ago

@psankhe28 Unfortunately, this does now exhibit merge conflicts. Would you mind repairing these locally and pushing the repairs?

psankhe28 commented 1 week ago

@psankhe28 Unfortunately, this does now exhibit merge conflicts. Would you mind repairing these locally and pushing the repairs?

Yeah, I will fix it.

anth-volk commented 1 week ago

I'm going to take the liberty of fixing these merge conflicts, as it's my earlier PR that opened them by deprecating the redesign folder. In the future, you'll probably want to keep your fork in line with the live repo by setting an "upstream" source. If you run git remote add upstream URL, using our repo's URL, you can later run git pull upstream master when you're on your own master to stay in date.

anth-volk commented 1 week ago

Okay, I have no idea what happened here, but I think what may have happened is that the old Collapsable was in the redesign folder, and that no longer exists, making git think you've made no changes. Your contributions to this, @psankhe28, were valued, so thank you for them.