You can squelch this message by running one of the following commands sometime before your next pull: Run git fsck to perform an integrity check of your repository. After attempting the cherry pick operation, if you have a merge conflict you’ll see a message like this on your screen:
Git Cherry Pick Without Commit A Quick Guide
Please check the exact command you entered.
Read on to learn how to fix a this type of conflict.
Git config pull.rebase false # merge (the default strategy) git config. However, conflicts can arise during this process, requiring careful handling. You need to do git fetch to get the latest commits in sync with local. I saw the new commit of branch a on the web.
My situation is a commit of the sync a branch in branch b, which appeared as a title error. # if this is not correct, please run # git update.
