can't sync because there are diverging changes;

notPlancha answered on March 1, 2023 Popularity 2/10 Helpfulness 1/10

answer can't sync because there are diverging changes;

Comment

git rebase upstream/main

then resolve conflicts with a tool (like vscode)

Popularity 2/10 Helpfulness 1/10 Language whatever

Source: Grepper

Tags: sync whatever

Link to this answer
Share Copy Link

Contributed on Mar 01 2023

notPlancha

0 Answers Avg Quality 2/10

Continue with Google

By continuing, I agree that I have read and agree to Greppers's Terms of Service and Privacy Policy.

Oops, You will need to install Grepper and log-in to perform this action.