1. 7

    Github now has a “squash and merge” option on pull requests, so you can have it both ways: a clean master branch history and a messy PR commit history. Only problem is that your PR branch commits no longer cleanly map back onto master so git branch -d always complains, etc.

    1. 7

      I’ve never understood when I would want to use squash and merge because it completely botches the commit message by just stitching all of the commit messages from the PR into one. That’s typically not what I want, especially if the PR commits are messily organized. It then becomes the responsibility of the person merging to write the commit message, which may not be the same person that submitted the PR. And you have to write the commit message in the Github web UI.

      I do use the “rebase and merge” functionality though.

      1. 3

        It then becomes the responsibility of the person merging to write the commit message, which may not be the same person that submitted the PR.

        Yeah, I think this is only a good idea for teams where the author of the PR is also the one merging it, and they just use the PR for review and comments.

      2. 3

        I’ve been very happy since this feature came out: I used to waste time crafting a commit timeline that communicated intent… now I just commit as I go, make sure no PR is too big, and then squash and merge (finally crafting a decent commit message at the end).

      1. 8

        There is, of course, the ever classic alternative: Caps Lock! Specifically, rebinding Caps Lock to Escape, or have it pull double-duty as both a control key and escape.

        1. 1

          I used to use seil and karibiner on a mac to dual map caps lock - hold for ctrl, tap for esc - but those stopped working in Sierra.

          Has anyone got those working?

          1. 1

            I haven’t upgraded to Sierra yet, but Karabiner Elements may work although a “double setup” for a key may not be supported. Am curious to hear how you get on.

            1. 1

              All the current solutions are hacky and haven’t worked very well.

              I just map it to Ctrl and make Crtl-] my new Escape key.

              1. 1

                Mind sharing your configuration? I don’t see a preset for that behaviour in Karabiner or Seil. (And I’m still using El Capitan :)

                1. 2

                  See here.

                2. 1

                  You can remap caps lock to escape directly in the settings in Sierra, no need for third party extensions.

                3. 1

                  That works pretty well, but I prefer to Control on Caps (with Backspace on left control, and Caps moved across to Backspace). Makes both chord-ing and editing easier in general. Still haven’t found a good place for Escape instead. Maybe switch with tilde? Just close enough to reach without moving my entire hand, far enough away to not knock?

                  1. 1

                    pull double-duty as both a control key and escape.

                    is there a way to do this on gnome?

                    1. 1

                      There’s a little program called xcape that does this.

                    2. 1

                      That’s what I do, I never use caps lock anyway. :)

                    1. 1

                      I think someone broke the Haskell sandbox.