Using p4merge as the Jujutsu merge tool on macOS
A quick tutorial on how to set up Jujutsu (jj) to use the p4merge tool from Perforce as the UI merging tool.
Joshua Lyman.com
Technologist, founder, and teacher
Latest posts
Demystifying Jujutsu (jj) Workspaces
I’ve really been enjoying Jujutsu (jj) for source control over the past several months. The ability to easily move amongst commits, move commits around, and rebase with abandon is great, and is akin to the power of Fig (a Mercurial
Delightful Touches: Mailspring Edition
Software that functions well is wonderful. Software that functions well and adds just a little bit of delight is the best. Mailspring is my email client of choice. I am incredibly picky when it comes to email clients (maybe because
Add HTTP Basic Authentication to CloudFront Distributions
I have a static site hosted in an S3 bucket (old 8mm family videos) that I wanted to make available to a limited number of folks, but I didn t want to bother with worrying about doing any sort of federated
How to cut and paste files on a Mac
tl;dr: Use Cmd+C to start a cut/copy operation like normal, and then use Option+Cmd+V to move the file. MAGIC. Macs have been my preferred computing platform since about 2003, my computing life has been much more enjoyable thanks to that
Switching Netlify built-in repos to Azure DevOps
I recently got into a sticky situation where I needed to move code from a repository hosted on BitBucket into one hosted on Azure DevOps, but this particular repo was backing a Netlify site that had autodeployments configured. I quickly
Simple Javascript Model Mapper Utility Functions
I bundled together useful code that I've reused on several projects for translating/mapping between Javascript models and corresponding API objects, and put it up on GitHub with some documentation for you to reuse.
What I learned bootstrapping in 2017
I ve been blessed to be able to spend nearly the entire past year focusing on Perspexi Labs, the company I co-founded with my great and very able business partner last year. We create the fastest feedback loop ever to help
Find hidden Apple refurbs
tl;dr By changing the first letter of a Mac s model to F and appending it to https://www.apple.com/shop/product/, you can access the product listing page for non-listed refurbished Macs. Example: for model MF839LL/A, URL is https://www.apple.com/shop/product/FF839LL/A. I was taking a look at Apple s
Using the C.H.I.P. computer and React to help kids get chores done
I almost titled this post When technologically actually works how you want it to, but figured it s such a rare event that nobody would actually believe it and would skip over it. 🙂 Believe it or not, this is one
There and Back Again…An iPhone to Android Story
A detailed breakdown of my experience switching from iPhone to Android for a month and a half, from the perspective of a consumer and a mobile developer.
React Native debugging tips
Developing applications in React Native is great, but in any real environment you will spend a large majority of your time debugging. Even though you are dealing with a mix of JavaScript and native app code, you can still get
Filter your Internet where it comes into your house: At the router itself
Pornography is a problem, a big problem. It is far too easily accessible by anyone in the home, thanks to the Internet. It s even getting difficult to avoid just stumbling upon pornography. In many homes today people, and especially children and
Failure #1: T-Shirts and Marketing
Marketing has never been my thing, and I suppose it still isn t. And finding, understanding, and connecting with audiences is obviously a skill I will need to work on. I ve always wanted this shirt. It speaks to the geek in
iOS Launch images Illustrator template download
I needed a quick way to make sure I had all the launch images for my Houston Tunnels app recently, as it was time to support some new devices like the iPhone 6 Plus. At first, I just took one
Highly-Leveraged Impact
Too many of us who start down the path of [career] compromise will never make it back. Considering the fact that you ll likely spend more of your waking hours at your job than in any other part of your life,
Quick First Impressions of Google Inbox
I ve had the chance to use Inbox for the last couple of days, and so far it s been a good experience. I ve been deep in the email space for several years now, even helping organize an email conference in the Bay Area
Daily Interests
Interesting artifacts found on January 23, 2014: Delicious: Alain Kelder Supplement your existing comment spam detection solution with a web server level DNSBL/RBL based approach
Daily Interests
Interesting artifacts found on January 13, 2014: Delicious: Domain Name Search, Domainr, the domain name search engine
Daily Interests
Interesting artifacts found on October 30, 2013: Delicious: Making Money Small Business Advice from Jason Fried of Inc.com, Mac OS X keyboard shortcuts Because it s always handy to have around , Safe Savings Rates: A New Approach to Retirement Planning over Really interesting