conflict is coming #10
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
yes it is , i think i resolved the conflict , but i dont know what to do now . @SadiqOnGithub can you please look into it |
SadiqOnGithub
commented
Sep 15, 2025
Owner
Author
SadiqOnGithub
left a comment
SadiqOnGithub
left a comment
There was a problem hiding this comment.
You have to review and approve. Are you able to see the option?
Collaborator
Yes now i am able to see but before it was not there . |
ErArman13
reviewed
Sep 16, 2025
Collaborator
ErArman13
left a comment
ErArman13
left a comment
There was a problem hiding this comment.
We resolved a merge conflict
Collaborator
|
@SadiqOnGithub , I think the merge conflict has been resolved, but I’m unable to review the changes. Does someone else need to approve it? If so, since you created the pull request, can you review your own request?" 
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
is this creating some conflict?