Skip to content

Instantly share code, notes, and snippets.

@ilyar
Last active March 22, 2024 09:39
Show Gist options
  • Save ilyar/9374463 to your computer and use it in GitHub Desktop.
Save ilyar/9374463 to your computer and use it in GitHub Desktop.
We can’t automatically merge this pull request. Use the command line to resolve conflicts before continuing.

We can’t automatically merge this pull request.

Use the command line to resolve conflicts before continuing.

Checkout via command line If you cannot merge a pull request automatically here, you have the option of checking it out via command line to resolve conflicts and perform a manual merge.

Step 1: From your project repository, check out a new branch and test the changes.

git checkout -b new_branch master
git pull repository.git branch

Step 2: Merge the changes and update on origin.

git checkout master
git merge new_branch
git push origin master
@vlsulliv
Copy link

vlsulliv commented Nov 1, 2021

good

@MBbison83
Copy link

i am creating a token. i am at comparing changes on repos. but i am not able to merge solana-labs/token-list with the head repo of Mbbison83/token-list. why?

@matifdeveloper
Copy link

Thank you

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment