Lazygit's Four Merge Options Explained: How Each Shapes Your Git History

·1 views

Lazygit's 'M' key in the branches panel opens a menu with four distinct merge options, each producing a different commit graph in Git history. The default 'm' option fast-forwards when possible, leaving a linear history with no merge marker, but falls back to a merge commit if the target branch has moved. The 'n' option always creates a merge commit with two parents, permanently marking where a branch was integrated. Squash merge options ('s' and 'S') condense all source branch commits into one, either leaving it uncommitted or committing it immediately. A developer documented these differences by building a throwaway repository and testing each option individually, using 'git log --oneline --graph' to observe the resulting history shape.

Read the full story at DEV Community

This is an AI-generated summary. ShortSingh links to the original source for the complete article.

Discussion (0)

Android's AI Ambitions Outpace Stable APIs, Developer Warns

A developer who spent 18 months building on Android's agentic APIs argues that Google's vision of an 'intelligent operating system' bundles three distinct engineering challenges — model runtime, app integration, and agent distribution — into a single marketing narrative. Google's own posts claim Gemini can already complete task automation on Android without user input, but the developer contends the shipping code lags well behind those assertions. The distribution layer, which determines which AI assistant gets privileged access to the user, is identified as the least trustworthy claim and the one receiving the least scrutiny. Android 17 will introduce Android Halo, a status-bar slot intended to surface any agent's activity, though the developer notes a UI slot is not the same as equal API access. On July 16, 2026, the European Commission ordered Alphabet under the Digital Markets Act to grant third-party AI assistants the same Android capabilities — including hotword detection, on-device context, and system actions — that Google extends to Gemini.

0 comments Read more at DEV Community

ProgrammingDEV Community ·

Developer Builds Real-Time 3D Digital Twin of Pune Using IDM/MOBIL Traffic Engine

A developer has created Pune Pulse, a real-time 3D digital twin of Pune, India, that renders 95,666 real buildings and accurate road geometry. The app uses the Intelligent Driver Model (IDM) and MOBIL lane-change algorithm to simulate realistic vehicle behaviour rather than scripted paths. A key feature is a what-if tool that lets users close any road and observe how traffic redistributes across the city. Built with React 19, React Three Fiber, and three.js, the web app is packaged for Android via Capacitor and is available on the Google Play Store. The simulation runs entirely offline with no API calls, no GPS usage, and no location tracking.

0 comments Read more at DEV Community

ProgrammingDEV Community ·

QBEACON API lets anyone run and verify a tamper-proof giveaway draw

A tool called QBEACON offers a cryptographically verifiable way to run online giveaways, addressing common accusations of rigging. Organizers first submit their entrant list via an API, which hashes and locks it before any random value is generated. The winner is then determined by a publicly published randomness beacon — a 4,096-bit, Ed25519-signed value chained to previous outputs and released roughly every 2.5 minutes — ensuring no one, including the organizer, can influence the outcome. A signed certificate and a public verification page are generated for each draw, allowing anyone to audit the result without an API key. The service is available on RapidAPI with a free tier supporting up to 10 draws per month for lists of up to 100 entrants.

0 comments Read more at DEV Community

ProgrammingDEV Community ·

EU-Funded TrustED Project Launches Real-World Pilots for Privacy-Safe Data Sharing

The EU-funded TrustED project is advancing privacy-preserving data sharing through two real-world pilots in Europe, moving beyond theoretical design into practical validation. One pilot tests a self-sovereign identity wallet for volunteers and NGOs to manage verifiable credentials without duplicating personal data across organisations. The second pilot uses federated learning to analyse clinical data across institutions while keeping raw data stored locally with each provider. Both pilots deploy privacy-enhancing technologies — including zero-knowledge proofs, homomorphic encryption, and differential privacy — alongside the European Digital Identity Wallet framework. The project, featured as a CORDIS Project of the Month, aims to demonstrate how organisations can collaborate and share data usefully without routinely exposing sensitive underlying information.

0 comments Read more at DEV Community