[wp-trac] [WordPress Trac] #56030: Update the Underscore library for 6.1
WordPress Trac
noreply at wordpress.org
Mon Jun 27 14:16:30 UTC 2022
#56030: Update the Underscore library for 6.1
-------------------------------------------------+-------------------------
Reporter: desrosj | Owner:
| christinavoudouris
Type: task (blessed) | Status: assigned
Priority: normal | Milestone: 6.1
Component: External Libraries | Version:
Severity: normal | Resolution:
Keywords: good-first-bug has-patch changes- | Focuses:
requested |
-------------------------------------------------+-------------------------
Changes (by desrosj):
* keywords: good-first-bug has-patch => good-first-bug has-patch changes-
requested
* owner: (none) => christinavoudouris
* status: new => assigned
Comment:
@christinavoudouris @dilipbheda Thanks for these PRs! Looks like this is
close.
> I was confused about the merge conflicts occurring and not sure why a
few of my packages are different.
@christinavoudouris I think the merge conflicts are occurring because your
fork is a bit outdated. You should be able to use the
[https://docs.github.com/en/pull-requests/collaborating-with-pull-requests
/working-with-forks/syncing-a-fork fetch and merge option] when viewing
your fork. Then you can recreate your PR, or pull the changes to your
fork's `trunk` branch into your pull request branch.
It looks like both PRs change different files, but all of those changes
are needed:
- `package.json`
- `package-lock.json`
- `script-loader.php`
I'm assigning the ticket to you @christinavoudouris as that's the way
`good-first-bug` tickets are marked as claimed.
--
Ticket URL: <https://core.trac.wordpress.org/ticket/56030#comment:8>
WordPress Trac <https://core.trac.wordpress.org/>
WordPress publishing platform
More information about the wp-trac
mailing list