Upgrade to OCaml 5.1 - Githubissues

ocaml-semver / ocaml-api-watch

Libraries and tools to keep watch on you OCaml lib's API changes

ISC License

21 stars 15 forks source link

Upgrade to OCaml 5.1 #29

Closed nawarajshah closed 8 months ago

nawarajshah commented 8 months ago

Upgrade to OCaml 5.1

Issue: https://github.com/NathanReb/ocaml-api-watch/issues/28

NathanReb commented 8 months ago

We just merged #30 so it seems you will have to rebase your work on top of main before we can merge!

Please let me know if you need help with this process!

nawarajshah commented 8 months ago

We just merged #30 so it seems you will have to rebase your work on top of main before we can merge!

Please let me know if you need help with this process!

Even though i did Rebase from my side, can you conform it?

17104167049847727659824475797855

NathanReb commented 8 months ago

It seems you didn't push your changes since github mentions there are still conflicts!

nawarajshah commented 8 months ago

It seems you didn't push your changes since github mentions there are still conflicts!

now I rebase using this tutorial. hope it works

NathanReb commented 8 months ago

@nawarajshah you still haven't pushed your changes.

A rebase is roughly a rewriting of your local git history on your working branch. If you want this to impact this PR you will have to push this change to you remote branch on your fork of the project.

Since the history has been rewritten after your previously pushed, you'll have to run git push --force as the remote branch isn't an ancestor of your local branch anymore (i.e. you did not simply add new commits on top of what is on the remote branch).

What do you get when running git status in your local copy of the project?

nawarajshah commented 8 months ago

@nawarajshah you still haven't pushed your changes.

A rebase is roughly a rewriting of your local git history on your working branch. If you want this to impact this PR you will have to push this change to you remote branch on your fork of the project.

Since the history has been rewritten after your previously pushed, you'll have to run git push --force as the remote branch isn't an ancestor of your local branch anymore (i.e. you did not simply add new commits on top of what is on the remote branch).

What do you get when running git status in your local copy of the project?

this Is what i get when i run git status

shonfeder commented 8 months ago

Can you show the output of these commands?

git remote -v
git log -1 upstream/main

nawarajshah commented 8 months ago

Can you show the output of these commands?

git remote -v

git log -1 upstream/main

This is the output.

NathanReb commented 8 months ago

What rebase command did you run? If you rebased on top of your local main branch, it's possible that it was simply out of sync with the upstream main branch.

You should either update your local main branch and rebase again:

git checkout main
git pull
git checkout nawaraj_shah
git rebase main

or simply rebase on top of the upstream main branch:

git fetch --all
git rebase origin/main

nawarajshah commented 8 months ago

git rebase origin/main

here it is

nawarajshah commented 8 months ago

Can you show the output of these commands?

git remote -v

git log -1 upstream/main

after I get help from Bard, I can get here

shonfeder commented 8 months ago

That's progress! This shows what I suspected: that you did not have a remote configured to track the "upstream" repository, and as a result where not able to pull the latest updates. This documentation can help with understanding how to manage remotes and you may find it useful in the future :) https://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes

Now, to move forward, from the branch associated with this PR, you should be able to

git rebase upstream/main

And then finally

git push --force

Should update this pull request your changes.

shonfeder commented 8 months ago

Fixed in an alternate PR.