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.

Sign up for GitHub

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

Jump to bottom

Merge user defined project extents when conflict is detected #6596

Draft

khanaffan wants to merge 3 commits into master from affanK/merge-project-extents

Contributor

khanaffan commented Apr 8, 2024 •

edited

If incoming change has a user-defined extent and locally it's not user-defined then we accept incoming change.
If incoming change is not user-defined and locally its user-defined incoming change is ignored.
If both incoming & local is user-defined then we merge/union the two.

khanaffan added 3 commits

April 8, 2024 15:52

WIP

f03828f


          way to resolve conflict in be_props

24c07b3

wip

3ac461e

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

Reviewers

bbastings Awaiting requested review from bbastings bbastings will be requested when the pull request is marked ready for review bbastings is a code owner

pmconne Awaiting requested review from pmconne pmconne will be requested when the pull request is marked ready for review pmconne is a code owner

At least 1 approving review is required to merge this pull request.