Skip to content

Anshika ko 1 hr laga#18

Open
AnshikaBajpai wants to merge 2 commits into
KamandPrompt:masterfrom
AnshikaBajpai:new--branch
Open

Anshika ko 1 hr laga#18
AnshikaBajpai wants to merge 2 commits into
KamandPrompt:masterfrom
AnshikaBajpai:new--branch

Conversation

@AnshikaBajpai

Copy link
Copy Markdown

No description provided.

@vsvipul

vsvipul commented Jun 2, 2020

Copy link
Copy Markdown
Member

@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

vsvipul commented Jun 2, 2020

Copy link
Copy Markdown
Member

@AnshikaBajpai Read online about how to resolve conflicts.

@AnshikaBajpai

Copy link
Copy Markdown
Author

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

@vsvipul

vsvipul commented Jun 2, 2020

Copy link
Copy Markdown
Member

@AnshikaBajpai No u never fixed ur conflicts.

@AnshikaBajpai

Copy link
Copy Markdown
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