19
So can they be merged or not?? (media.piefed.social)
submitted 1 month ago by to c/software_gore@programming.dev
5 comments fedilink hide all child comments
 

github at its finest ^

all 5 comments

sorted by: hot top controversial new old
[–] 9 points 1 month ago (1 child)

I don’t get how this is software gore? It’s a merge conflict, a kind of common thing in Git.

  • permalink
  • fedilink
  • source
  • hideshow 1 child comment
    •
    • [–] 6 points 1 month ago (1 child)

    yeah, I've seen this bs multiple times now. Also tired of github rewriting commits and changing hashes when they can just be fastforwrded onto the merging branch. So for a while now I almost exclusively use the command line to merge.

  • permalink
  • fedilink
  • source
  • hideshow 1 child comment
    •
  • [–] 1 point 1 month ago

    Would really prefer they didn't have these buttons, if they're not implemented correctly. Similarly, there's a setting to uses rebases throughout the UI instead of merge commits. And it works everywhere, except when updating PR branch. It has a button "Update branch", which does the wrong thing, with a dropdown where you can select "Rebase branch" instead. So many times, I've had to tell people to not click that button...

  • permalink
  • fedilink
  • source
  • parent
    • [–] 5 points 1 month ago

    Nix 🥰

  • permalink
  • fedilink
  • source
    •