Skip to content
By using Twitter’s services you agree to our Cookies Use. We and our partners operate globally and use cookies, including for analytics, personalisation, and ads.
  • Home Home Home, current page.
  • About

Saved searches

  • Remove
  • In this conversation
    Verified accountProtected Tweets @
Suggested users
  • Verified accountProtected Tweets @
  • Verified accountProtected Tweets @
  • Language: English
    • Bahasa Indonesia
    • Bahasa Melayu
    • Català
    • Čeština
    • Dansk
    • Deutsch
    • English UK
    • Español
    • Filipino
    • Français
    • Hrvatski
    • Italiano
    • Magyar
    • Nederlands
    • Norsk
    • Polski
    • Português
    • Română
    • Slovenčina
    • Suomi
    • Svenska
    • Tiếng Việt
    • Türkçe
    • Ελληνικά
    • Български език
    • Русский
    • Српски
    • Українська мова
    • עִבְרִית
    • العربية
    • فارسی
    • मराठी
    • हिन्दी
    • বাংলা
    • ગુજરાતી
    • தமிழ்
    • ಕನ್ನಡ
    • ภาษาไทย
    • 한국어
    • 日本語
    • 简体中文
    • 繁體中文
  • Have an account? Log in
    Have an account?
    · Forgot password?

    New to Twitter?
    Sign up
chaosprime's profile
Chaos
Chaos
Chaos
@chaosprime

Tweets

Chaos

@chaosprime

problemagic

Joined July 2012

Tweets

  • © 2019 Twitter
  • About
  • Help Center
  • Terms
  • Privacy policy
  • Imprint
  • Cookies
  • Ads info
Dismiss
Previous
Next

Go to a person's profile

Saved searches

  • Remove
  • In this conversation
    Verified accountProtected Tweets @
Suggested users
  • Verified accountProtected Tweets @
  • Verified accountProtected Tweets @

Promote this Tweet

Block

  • Tweet with a location

    You can add location information to your Tweets, such as your city or precise location, from the web and via third-party applications. You always have the option to delete your Tweet location history. Learn more

    Your lists

    Create a new list


    Under 100 characters, optional

    Privacy

    Copy link to Tweet

    Embed this Tweet

    Embed this Video

    Add this Tweet to your website by copying the code below. Learn more

    Add this video to your website by copying the code below. Learn more

    Hmm, there was a problem reaching the server.

    By embedding Twitter content in your website or app, you are agreeing to the Twitter Developer Agreement and Developer Policy.

    Preview

    Why you're seeing this ad

    Log in to Twitter

    · Forgot password?
    Don't have an account? Sign up »

    Sign up for Twitter

    Not on Twitter? Sign up, tune into the things you care about, and get updates as they happen.

    Sign up
    Have an account? Log in »

    Two-way (sending and receiving) short codes:

    Country Code For customers of
    United States 40404 (any)
    Canada 21212 (any)
    United Kingdom 86444 Vodafone, Orange, 3, O2
    Brazil 40404 Nextel, TIM
    Haiti 40404 Digicel, Voila
    Ireland 51210 Vodafone, O2
    India 53000 Bharti Airtel, Videocon, Reliance
    Indonesia 89887 AXIS, 3, Telkomsel, Indosat, XL Axiata
    Italy 4880804 Wind
    3424486444 Vodafone
    » See SMS short codes for other countries

    Confirmation

     

    Welcome home!

    This timeline is where you’ll spend most of your time, getting instant updates about what matters to you.

    Tweets not working for you?

    Hover over the profile pic and click the Following button to unfollow any account.

    Say a lot with a little

    When you see a Tweet you love, tap the heart — it lets the person who wrote it know you shared the love.

    Spread the word

    The fastest way to share someone else’s Tweet with your followers is with a Retweet. Tap the icon to send it instantly.

    Join the conversation

    Add your thoughts about any Tweet with a Reply. Find a topic you’re passionate about, and jump right in.

    Learn the latest

    Get instant insight into what people are talking about now.

    Get more of what you love

    Follow more accounts to get instant updates about topics you care about.

    Find what's happening

    See the latest conversations about any topic instantly.

    Never miss a Moment

    Catch up instantly on the best stories happening as they unfold.

    1. Rachel Franklin‏ @tobequitefrank1 Apr 22
      • Report Tweet
      Replying to @chaosprime @BenLesh

      Just out of curiosity, why should you not rebase against master? I thought it was good practice to rebase often, and never merge master into your branch 😳 or is this specific to atlassian bamboo? plz help

      1 reply 0 retweets 0 likes
    2. Bram Gotink‏ @bram_gotink Apr 22
      • Report Tweet
      Replying to @tobequitefrank1 @chaosprime @BenLesh

      Bram Gotink Retweeted Cold Stone Steve Austin

      He's talking about rebasing the master branch itself, not rebasing another branch onto master. Rebasing master means you're changing the history of master, breaking every clone or fork. They didn't actually rebase by the way:https://twitter.com/davidreghay/status/1120176026603139075?s=19 …

      Bram Gotink added,

      Cold Stone Steve Austin @davidreghay
      Replying to @davidreghay @chaosprime
      For the record we _technically_ didn't rebase master. We went with `git filter-branch --msg-filter` with a sed command to delete the offending emoji from the commit message. This at least leaves the branching history intact
      2 replies 0 retweets 4 likes
    3. IRC User‏ @widdr Apr 22
      • Report Tweet
      Replying to @bram_gotink @tobequitefrank1 and

      That's actually still a history rewrite though. The commit message is part of the commit object, which is in turn hashed to become the commit id, which must be referenced by all child commits... It didn't use the "rebase" tool/command, but the same effect was achieved.

      2 replies 0 retweets 3 likes
    4. Cold Stone Steve Austin‏ @davidreghay Apr 22
      • Report Tweet
      Replying to @widdr @bram_gotink and

      It still creates new commits and hashes but it's not technically the same as rebasing, which "flattens" history and requires actually replaying changes. This preserves history more faithfully, for example by leaving the branching history intact

      1 reply 0 retweets 4 likes
    5. IRC User‏ @widdr Apr 22
      • Report Tweet
      Replying to @davidreghay @bram_gotink and

      You can use rebase without actually inserting, reordering, or removing commits (like rebase -i to do rewording). When you do this it's the same as the other thing and doesn't create any new tree references, and thus requires no replays :) IDEA has a "reword" UI element for this.

      1 reply 0 retweets 0 likes
    6. IRC User‏ @widdr Apr 22
      • Report Tweet
      Replying to @widdr @davidreghay and

      But yeah, again, it's just just multiple different tools and methods to do the same thing, none of which affect the tree snapshots, only the commit graph.

      1 reply 0 retweets 0 likes
    7. Cold Stone Steve Austin‏ @davidreghay Apr 22
      • Report Tweet
      Replying to @widdr @bram_gotink and

      rebase _always_ replays commits. when your history is complex this can lead to weird conflicts even when all you're trying to do is "reword" a single commit. that's even if you use the `-p` option for preserving merge commits.

      2 replies 0 retweets 1 like
    8. Cold Stone Steve Austin‏ @davidreghay Apr 22
      • Report Tweet
      Replying to @davidreghay @widdr and

      also, the commit graph is what i was talking about. if you rebase without making any substantive changes (i.e. leave in all the commits as "pick" or "reword" whatever) you will end up with a flattened graph. the `-p` option can alleviate this but you can still get conflicts

      1 reply 0 retweets 2 likes
    9. Cold Stone Steve Austin‏ @davidreghay Apr 22
      • Report Tweet
      Replying to @davidreghay @widdr and

      we definitely considered rebasing as an option but ultimately this was a case where `filter-branch` a) made sense and b) avoided conflicts that were specifically being caused by attempting to rebase

      1 reply 0 retweets 1 like
    10. Cold Stone Steve Austin‏ @davidreghay Apr 22
      • Report Tweet
      Replying to @davidreghay @widdr and

      just by the way i am a big fan of rebasing and all the control it offers

      2 replies 0 retweets 0 likes
      Chaos‏ @chaosprime Apr 22
      • Report Tweet
      Replying to @davidreghay @widdr and

      aka more rope than anybody could possibly need to hang themselves

      11:54 AM - 22 Apr 2019
      • 3 Likes
      • rj Cold Stone Steve Austin Bram Gotink
      1 reply 0 retweets 3 likes
        1. New conversation
        2. IRC User‏ @widdr Apr 22
          • Report Tweet
          Replying to @chaosprime @davidreghay and

          With enough rope, you can land on the ground and run away!

          1 reply 0 retweets 3 likes
        3. 1 more reply

      Loading seems to be taking a while.

      Twitter may be over capacity or experiencing a momentary hiccup. Try again or visit Twitter Status for more information.

        Promoted Tweet

        false

        • © 2019 Twitter
        • About
        • Help Center
        • Terms
        • Privacy policy
        • Imprint
        • Cookies
        • Ads info