Beehaw
  • Communities
  • Create Post
  • search
    Search
  • Login
  • Sign Up
mastermind ( mastermind@lemm.ee )  to Programmer Humor@programming.dev · 3 years ago

Openheimer in programming

i.postimg.cc

message-square
10
link
fedilink
190

Openheimer in programming

i.postimg.cc

mastermind ( mastermind@lemm.ee )  to Programmer Humor@programming.dev · 3 years ago
message-square
10
link
fedilink
  • jcg ( jcg@halubilo.social ) 
    link
    fedilink
    arrow-up
    3
    ·
    3 years ago

    What happens when you want to merge again? Won’t it say already up to date or something cause the commits are already there?

    • Hexarei ( Hexarei@programming.dev ) 
      link
      fedilink
      arrow-up
      2
      ·
      3 years ago

      Revert doesn’t just move head back, it creates reversal commits. As such, merging again can happen since the changes are present and require a merge commit

      • Double_A ( Double_A@discuss.tchncs.de ) 
        link
        fedilink
        arrow-up
        1
        ·
        3 years ago

        There are situations where it does actually cause problems when you want to merge the branch again. It knows that those specific commits have already been reverted once, so it doesn’t apply them…

        See also: https://github.com/git/git/blob/master/Documentation/howto/revert-a-faulty-merge.txt (especially line 56)

        Basically you need to revert the revert, before re-merging the fixed branch. Otherwise you will lose commits without noticing!

Programmer Humor@programming.dev

programmer_humor@programming.dev

Subscribe from Remote Instance

Create a post
You are not logged in. However you can subscribe from another Fediverse account, for example Lemmy or Mastodon. To do this, paste the following into the search field of your instance: !programmer_humor@programming.dev

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

  • Keep content in english
  • No advertisements
  • Posts must be related to programming or programmer topics
    • If the mod doesn’t find it funny, you’re banned. Ha-ha!.. For real: do not use the community for “statements”. There are other places for such content. Keep it chill and funny.
Visibility: Public
globe

This community can be federated to other instances and be posted/commented in by their users.

  • 1.63K users / day
  • 2.71K users / week
  • 4.28K users / month
  • 7.73K users / 6 months
  • 462 local subscribers
  • 33.7K subscribers
  • 1.58K Posts
  • 25.9K Comments
  • Modlog
  • mods:
  • Feyter ( Feyter@programming.dev ) 
  • adr1an ( anzo@programming.dev ) 
  • BurningTurtle ( BurningTurtle@programming.dev ) 
  • Pierre-Yves Lapersonne ( pylapp@programming.dev ) 
  • BE: 0.19.15
  • Modlog
  • Legal
  • Instances
  • Docs
  • Code