Open
Conversation
Member
|
@AnubhaSharma2709 Please make another commit fixing all these merge conflicts |
Author
Okay |
Author
hey How do I have to solve these merge conflicts . None of them are related to what I have done. these conflicts are on the blog card and social cards. |
Member
|
@AnubhaSharma2709 Take a pull and select all incoming changes. Then make a commit again |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Pull Request Template
Description:
I have modified on price card and added two more. I am also working towards creating more
Please Review my work
Under GSSoC'23