767
Git, invented in 2005. Programmers on 2004: (lemmy.eco.br)
submitted 2 years ago by to c/programmer_humor@programming.dev
157 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] 8 points 2 years ago* (last edited 2 years ago) (4 children)

There are multiple solutions to this without using --force.

Move the files, clone, unmove the files, commit, push being the most straightforward that I can summon at this time.. but I've solved this dozens of times and have never use --force.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 4 child comments
    •
  • [–] 3 points 2 years ago (3 children)

    If your remote is completely empty and has no commits, you can just push normally. If it has an auto-generated "initial commit" (pretty sure Github does something like that), you could force push, or merge your local branch into the remote branch and push normally. I think cloning the repo and copying the contents of your local repo into it is the worst option: you'll lose all local commits.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 3 child comments
    •
  • [–] 2 points 2 years ago

    If it's a single, generated, "initial" commit that I actually want to keep (say, for ex I used the forge to generate a license file) then I would often rebase on top of it. Quick and doesn't get rid of anything.

  • permalink
  • fedilink
  • source
  • parent