Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added label to manage locations menu #30488

Closed
wants to merge 1 commit into from

Conversation

Quintis1212
Copy link
Contributor

Hi , I added label to manage location menu on "Navigation screen: regression of improved menu locations select placeholder #30330" issue

@talldan
Copy link
Contributor

talldan commented Apr 7, 2021

Hi @Quintis1212, thanks for working on this.

Looks like there are some conflicts. Just to check, when creating the branch, did you use master or trunk as the base?

The repository now uses trunk as the main branch. Anything branched off of master will be outdated.

@talldan talldan added [Feature] Navigation Screen [Type] Regression Related to a regression in the latest release labels Apr 7, 2021
@Quintis1212
Copy link
Contributor Author

Quintis1212 commented Apr 10, 2021

Hi @Quintis1212, thanks for working on this.

Looks like there are some conflicts. Just to check, when creating the branch, did you use master or trunk as the base?

The repository now uses trunk as the main branch. Anything branched off of master will be outdated.

Hi @talldan ) I have created this PR from trunk , I don't know why there is a conflict. What can I do to help this PR ?I ve created branch for this PR 7 days ago

@talldan
Copy link
Contributor

talldan commented Apr 12, 2021

@Quintis1212 It seems like when you created the branch your version of trunk was out of date. I think the file you edited has since moved because there were some changes to the UI (this is where the file is nowhttps://github.com/WordPress/gutenberg/blob/trunk/packages/edit-navigation/src/components/inspector-additions/manage-locations.js).

I think your options are to either rebase or merge the latest code from trunk into your branch, fix the conflicts and push.

Or for a small change like this it might be easier to create a new branch off of (an up-to-date) trunk and use that instead.

@Quintis1212
Copy link
Contributor Author

@Quintis1212 It seems like when you created the branch your version of trunk was out of date. I think the file you edited has since moved because there were some changes to the UI (this is where the file is nowhttps://github.com/WordPress/gutenberg/blob/trunk/packages/edit-navigation/src/components/inspector-additions/manage-locations.js).

I think your options are to either rebase or merge the latest code from trunk into your branch, fix the conflicts and push.

Or for a small change like this it might be easier to create a new branch off of (an up-to-date) trunk and use that instead.

@talldan PR from new branch - #30933

@kevin940726
Copy link
Member

Thanks, I'll close this in favor of #30933.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Type] Regression Related to a regression in the latest release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants