Skip to content

Instantly share code, notes, and snippets.

@Arique1104
Created December 13, 2023 20:42
Show Gist options
  • Save Arique1104/8cac9bf75bbcd710228a6f6e821d0915 to your computer and use it in GitHub Desktop.
Save Arique1104/8cac9bf75bbcd710228a6f6e821d0915 to your computer and use it in GitHub Desktop.

Worklog 12.1.23

file push up error

I have tried to seperate some breaking changes, but need to retrace my steps:

  • Here are my three branches: node20-dependencies-aa, dependencies, and node18-patch-arique
  • dependencies - has all package.json updates.
  • it looks like Node20 dependencies also has all these files. Let's create a pull request from dependencies to node20-dependencies-aa
  • can confirm that there are zero differences between node20 dependencies and dependencies. So now, the only valid pull request is node18-patch-aa to node20-update-aa
  • there aren't any changes between those two?! Odd.
  • OMG...I have a wild git fire and no way to reconcile it.
  • I think I need to walk away. BREAK TIME!
  • There is now this pull request where I follow all my error messages and push up all my changes to the node-update-III
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment