Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Already on 'idf-release/v4.4' Your branch and 'origin/idf-release/v4.4' have diverged, and have 1 and 19 different commits each, respectively. (use "git pull" to merge the remote branch into yours) fatal: Not possible to fast-forward, aborting. #122

Open
0x0fe opened this issue May 15, 2023 · 2 comments
Open

Already on 'idf-release/v4.4' Your branch and 'origin/idf-release/v4.4' have diverged, and have 1 and 19 different commits each, respectively. (use "git pull" to merge the remote branch into yours) fatal: Not possible to fast-forward, aborting. #122

0x0fe opened this issue May 15, 2023 · 2 comments

Comments

@0x0fe
Copy link

0x0fe commented May 15, 2023 •
edited
Loading

What is the problem? and what is the right way to fix it?
Obviously just git pull did not fix the problem, it tells "already up to date" but still fails to build with the same error.

image
@Jason2866
Copy link
Contributor

Do a pull rebase of your fork.

@0x0fe
Copy link
Author

0x0fe commented May 17, 2023 •
edited
Loading

sadly, doesnt work :
image

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@Jason2866 @0x0fe