Show HN: Character-Based Git Conflict Resolution https://ift.tt/7R2eVTO

Show HN: Character-Based Git Conflict Resolution Hello HN! I was always annoyed by conflicts that can be solved automatically, but still need human intervention. E.g. two people changing the same line, but at different, non-conflicting positions. So I searched for a character based patching library and found this nice article https://ift.tt/dULXRsn and its corresponding library https://ift.tt/sPGflei . Parsing git conflicts, applying patches and showing some useful diffs in the UI helps me to solve 80% of my conflicts automatically. I hope it can help you too. Happy Hacking! https://ift.tt/aQqYSiL May 13, 2022 at 11:31PM

Komentar

Posting Komentar

Postingan populer dari blog ini

Twin Peaks for All: Survey Results

Gambar
Twin Peaks for All: Survey Results By Benjamin Barnett Last month, the SFMTA and San Francisco Recreation and Parks Department released a survey seeking public feedback regarding  five proposed roadway options for Twin Peaks Boulevard . San Franciscans responded to the survey, ranked support for each alternative and shared opinions about how the different options met their needs.  The Twin Peaks for All survey was open for almost three weeks and received more than 1,700 responses. This number reflects the high level of interest for this San Francisco park and its future access.   Survey Background Conditions on Twin Peaks Boulevard between Portola Drive and Barnett Avenue before COVID street closures.   The Twin Peaks Boulevard gates were closed early in the pandemic to reduce crowding at the lookout point parking lot. The gates were closed on the north, at Burnett Avenue, and the south, at Portola Drive. Since then, Twin Peaks Park use by hikers, joggers and peopl...
Baca selengkapnya

Launch HN: Riot (YC W20) – Phishing training for your team https://ift.tt/2QIueZL

Launch HN: Riot (YC W20) – Phishing training for your team Ahoy Hacker News! I'm Ben, founder of Riot ( https://tryriot.com ), a tool that sends phishing emails to your team to get them ready for real attacks. It's like a fire drill, but for cybersecurity. Prior to Riot, I was the co-founder and CTO of a fintech company operating hundred of millions of euros of transactions every year. We were under attack continuously. I was doing an hour-long security training once a year, but was always curious if my team was really ready for an attack. In fact, it kept me up at night thinking we were spending a lot of money on protecting our app, but none on preparing the employees for social engineering. So I started a side project at that previous company to test this out. On the first run, 9% of all the employees got scammed. I was pissed, but it convinced me we needed a better way to train employees for cybersecurity attacks. This is what grew into Riot. For now we are only training for...
Baca selengkapnya

Muni Forward Gets San Francisco Moving

Gambar
Muni Forward Gets San Francisco Moving By Shalon Rogers The SFMTA’s Muni Forward program is delivering transit reliability improvements that are transforming the Muni system and enhancing the customer experience. With 80 miles of upgrades since 2014 that often bring travel time savings of 20% or more, Muni Forward is making a big difference in how San Francisco moves.  These upgrades, which can be seen in this Muni Forward Photo Map , draw from a “toolkit” of over 20 reliability and customer experience improvements, such as transit lanes that provided dedicated space for Muni vehicles to cut through traffic, transit bulbs that reduce delays at transit stops and traffic signals with transit priority that give the green light to transit vehicles as they approach the intersection, when possible. The recently completed Van Ness Improvement Project thrust Muni Forward back into the spotlight with San Francisco’s first Bus Rapid Transit (BRT) corridor. While the Van Ness Improve...
Baca selengkapnya