Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[orion-dev] Re-fetch your orion.client repository from remote

Hi foks,

We needed to re-write history on the orion.client repo to eliminate a file that was accidentally commited/pushed.
See


If you were caught up on master and  ahead of the removal of the file you will get an error when you fetch saying "Cannot fast-forward".

To fix the problem you will have to...
1) Save any current changes in a branch
2) On  the Git Repository page go to "Remote" and fetch from the origin.
3) Go to the "Branches" page and checkout the "origin/master" branch
4) Cherry pick across any of your changes / redo them etc.

Sorry for the inconvenience but we unfortunately had to do this immediately.

-Simon

GIF image


Back to the top