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.

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

feat-req: Guide on how to upgrade versions #220

Open
SSmale opened this issue Jan 8, 2024 · 1 comment
Open

feat-req: Guide on how to upgrade versions #220

SSmale opened this issue Jan 8, 2024 · 1 comment

Comments

@SSmale
Copy link
Contributor

SSmale commented Jan 8, 2024

I saw that you had released v4 but I could not find a guide on how to upgrade. when I tried to merge the changes in I got an error about no shared history.

to get mine upgraded I think I did the followinng steps:

  1. checkout the upgrade code
  2. create a new branch and delete everything BUT the .git dir
  3. copy all the files in from the upgraded branch into the now empty directory
  4. use the diff to revert, stage or combine the changes.
@benjaminrae
Copy link
Contributor

When you get that error you can merge with the --allow-unrelated-histories flag and then you just need to to resolve the conflicts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants