search

facebookarchive / BOLT

Binary Optimization and Layout Tool - A linux command-line utility used for optimizing performance of binaries
2.51k stars 176 forks source link

[Question] git pull failed for rebased branch #180

Closed HShan886 closed 3 years ago

HShan886 commented 3 years ago

when I try to update rebased branch, I will get merge failed. Like: Automatic merge failed; fix conflicts and then commit the result.

But, I doesnot modify any code of bolt.

PS: my git version: git version 2.24.3 (Apple Git-128)

Thank you.

yota9 commented 3 years ago

Hello @fengali . The rebased branch is usually force updated, so git could not rebase it properly. You can get the latest updates with:

git fetch
git reset --hard origin/rebased

In case you don't have any changes.

HShan886 commented 3 years ago

it works. thank @yota9 for replying.