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

[NUI] Exclude layouting on invisible children #6620

Open
wants to merge 1 commit into
base: DevelNUI
Choose a base branch
from

Conversation

everLEEst
Copy link
Contributor

Description of Change

API Changes

  • ACR:

@dongsug-song
Copy link
Contributor

Hello, There was a diff and conflict between DevelNUI and main, causing difficulties in integrating NUI. Therefore, a hard reset was performed on DevelNUI. As a result, the pull requests (https://github.com/Samsung/TizenFX/pulls) in DevelNUI are now conflicting. To resolve this, you can go to the specific PR, where you will see an error indicating a conflict. You can then use the command line to resolve the conflict.
or Here is another example. This one updates everything below the topmost patch, leaving only the topmost patch unchanged.

git fetch upstream  
git rebase --onto=upstream/DevelNUI HEAD~1  
git push {current working branch} -f

I'm sorry for the inconvenience.
thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants