Search
How to Flatten git Commits
7.1.2022
One of my least favorite tasks as a software engineer is resolving merge conflicts. A simple rebase is a frequent occurrence but the rare massive conflict is inevitable when many engineers work in a single codebase. One thing that helps me deal with large rebases with many merge conflicts...
Rebase vs. Merge: Integrating Changes in Git
2.11.2021
This article is part of our “Advanced Git” series. Be sure to follow us on Twitter or sign up for our newsletter to hear about the next articles!
Most developers understand that it’s important to use branches in Git. In …
The post Rebase vs. Merge: Integrating Changes in Git appeared...
Merge Conflicts: What They Are and How to Deal with Them
28.10.2021
Merge conflicts... Nobody likes them. Some of us even fear them. But they are a fact of life when you're working with Git, especially when you're teaming up with other developers. In most cases, merge conflicts aren't as scary as you might think. In this fourth part of our “Advanced Git” series...
Government Watchdog Investigates Conflicts of Interest Involving SEC Officials, Crypto, XRP, Ripple Lawsuit
18.8.2021
Government watchdog Empower Oversight has requested internal documents from the U.S. Securities and Exchange Commission (SEC) on cryptocurrency that potentially show conflicts of interest at the commission involving former high-level officials. This affects the commission’s lawsuit against...
Ethereum 2.0 Delayed Until 2022 Due To Team Conflicts
9.6.2021
Ethereum 2.0 seeks to enhance the safety and scalability of the Ethereum platform. Launched in 2015 in tandem with cryptocurrency ETH, Ethereum is today the second largest after Bitcoin and can undertake thousands of transactions per second. Ethereum 2.0 is poised to spearhead the DeFi revolution....
Bitmain Delays Antminer Shipments Amid Internal Conflicts
6.8.2020
Bitmain announces three-month Antminer order delays, citing “external interference on company operation.”
A Font-Like SVG Icon System for Vue
24.7.2020
Managing a custom collection of icons in a Vue app can be challenging at times. An icon font is easy to use, but for customization, you have to rely on third-party font generators, and merge conflicts can be painful to resolve since fonts are binary files.
Using SVG files instead can eliminate...
Conflicts, Interests, Emojis and 20 Crypto Jokes
8.2.2020
Let's recap what happened in this crypto week. Total value locked in DeFi hit 1 billion! The public war-of-words between the co-founders of the IOTA Foundation took a fresh turn, Bitspark will close due to internal issues despite reporting positive results, but the first phase of Ethereum 2.0...
Stablecoins Are Crypto’s Version of Fractional Reserve Banking
6.1.2020
Stablecoins provide much sought after stability in the volatile crypto markets. They are sometimes even said to affect the price of bitcoin in drastic fashion. Tether (USDT) in particular continues to be widely scrutinized for this, with recent lawsuits about conflicts of interest and price...
Indian State of Kerala to Produce 20,000 Blockchain Specialists in 2 Years
17.12.2019
Beijing’s sudden rush into blockchain development and digital currency hasn’t gone unnoticed. From America to Europe and back to Asia, governments have started thinking about this new racetrack in more serious terms. India has a history of tensions with China, although the countries...
R3 Plagued by Internal Conflicts Over Corda, Sources Claim
22.8.2019
Frustration and delay looms over the development of R3’s enterprise blockchain platform Corda, sources have alleged
Consensys Inner Conflicts Spark Legal Action Against Founder
25.7.2019
Ethereum cofounder Joseph Lubin was recently summoned to court in New York when a former employee initiated a lawsuit for more than $13 million. According to the summons stemming from former Token Foundry CEO, Harrison Hines, relief was being sought for alleged unpaid profits, fraud, unjust...