Skip to content

Conversation

@LakshmiSowmya04
Copy link
Contributor

No description provided.

@LakshmiSowmya04
Copy link
Contributor Author

LakshmiSowmya04 commented Dec 2, 2025

@petern48 can you check this PR ....I actually did the changes u mentioned but I am not sure how I solved merge conflicts....I mistakenly over looked it.Please let me know for any more further changes .I will add references and proper title if you review and approve the current changes ,Thank you.

Comment on lines -2901 to -2912
("MULTIPOINT ((0 0), (1 1))", 0),
("MULTILINESTRING ((0 0, 1 1), (2 2, 3 3))", 0),
("POINT EMPTY", 0),
("MULTIPOINT EMPTY", 0),
("LINESTRING EMPTY", 0),
("MULTILINESTRING EMPTY", 0),
("MULTIPOINT ((0 0), (1 1))", 0),
("MULTILINESTRING ((0 0, 1 1), (2 2, 3 3))", 0),
("POINT EMPTY", 0),
("MULTIPOINT EMPTY", 0),
("LINESTRING EMPTY", 0),
("MULTILINESTRING EMPTY", 0),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but I am not sure how I solved merge conflicts

Yeah, looking at the change, this isn't quite the change we were trying to do here. It looks like you're running into complications given you're trying to re-use your old branch that was already merged. I recommend just fixing this in a fresh new branch:

  1. Delete this local branch
  2. Updating your local main branch with the most up-to-date main from this repo
  3. Create a new branch make your change
  4. Either force push to this remote branch st_numrings so you can re-use this PR OR create a brand new PR and close this one. (Alternatively, just lump the change into your existing PR)

@LakshmiSowmya04 LakshmiSowmya04 deleted the st_numrings branch December 4, 2025 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants