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.

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

Profile Update #1

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Profile Update #1

wants to merge 3 commits into from

Conversation

Safal08
Copy link

@Safal08 Safal08 commented Oct 8, 2020

No description provided.

@sarveshsrv
Copy link
Collaborator

What are those binary files which you have pushed? Please go through the Contributors.md file and read the last paragraph. And hence please attach the screenshot of your profile card with the code.

@sarveshsrv sarveshsrv added the conflicts When the branch is having merge conflicts with the master. label Oct 9, 2020
@sarveshsrv
Copy link
Collaborator

Getting conflicts. You'll need to update your branch with new commits from the master, resolve those conflicts, and push the updated/resolved branch here. It's really simple and will take a few minutes to fix @Safal08

@Safal08
Copy link
Author

Safal08 commented Oct 9, 2020 via email

@Safal08
Copy link
Author

Safal08 commented Oct 9, 2020

I think the conflict is resolved now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
conflicts When the branch is having merge conflicts with the master.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Safal08 @sarveshsrv