Skip to content

Conversation

@AnshikaBajpai
Copy link

No description provided.

@vsvipul
Copy link
Member

vsvipul commented Jun 2, 2020

@AnshikaBajpai try this-
git remote add upstream https://github.com/KamandPrompt/GitSession.git
git fetch upstream
git rebase upstream/master
git push origin new--branch --force

@vsvipul
Copy link
Member

vsvipul commented Jun 2, 2020

@AnshikaBajpai Read online about how to resolve conflicts.

@AnshikaBajpai
Copy link
Author

@vsvipul why did I get resolve conflicts again? Because you accepted other PRs?

@vsvipul
Copy link
Member

vsvipul commented Jun 2, 2020

@AnshikaBajpai No u never fixed ur conflicts.

@AnshikaBajpai
Copy link
Author

@Signior-X tch tch tch
@vsvipul ok I'll try again

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