SShortSingh.
Back to feed

When a parent Git branch is updated, its child branch can keep the old parent commit

0
·1 views

A parent branch can match its remote exactly while a child branch still contains the parent's earlier commit, which can make a stacked merge request diff show the parent's changes. The problem was found during a local test for GitLab CLI issue #8283, where the commit graph revealed a mismatch that git status did not. The article demonstrates this in a disposable repository with a local bare remote, where amending the parent and force-pushing it leaves the child pointing at the old commit. An ancestry check fails and the log shows the superseded parent commit still in the child's history. The fix is to confirm the old parent is an ancestor of the child, back up the child, and rebase only the commits after that boundary onto the new parent. The author also advises fetching and inspecting a shared child branch before rewriting its history.

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)

Log in to join the discussion and vote.

Log in

Related stories

0
ProgrammingDEV Community ·

F5 Patches Critical Use-After-Free in NGINX Mail Proxy Module (CVE-2026-113425)

F5 has assigned CVE-2026-113425, a critical use-after-free flaw in the ngx_mail_proxy_module of NGINX Open Source and NGINX Plus when configured as a mail proxy. A specially crafted mail session can crash worker processes or, where ASLR is disabled or bypassable, potentially lead to code execution. The fix was published on November 18, with patched NGINX Open Source versions 1.31.9 and 1.30.7 and NGINX Plus releases 37.3.0.1 and 37.0.8.1. The advisory does not publish a full packet sequence or public exploit, and the most immediate risk is service disruption to mail authentication and relay functions. Experts recommend mapping every mail relay dependency, verifying patched builds including those in distribution packages and containers, and restricting mail listeners to trusted networks.

0
ProgrammingDEV Community ·

Developer shares nine free side projects, from a countdown timer to Nordic subtitle tools

A Swedish developer and father has released nine small free tools and games he built in his spare time, most of them with help from Claude Code, which he discloses on every page. The projects include Zexa Timer, a no-sign-up countdown display controllable from a phone, and Nordic Dual Subs, a Chrome extension that adds Scandinavian subtitles and translations to several public broadcasters' streaming services. Other offerings include Melarka, a self-hosted open-source music server, several open-source developer tools, a site for Chinese speakers in Sweden, and two kid-friendly Roblox games. All are free and ad-free, and they are gathered on a single home page while each runs on its own subdomain so that one can be retired without affecting the rest. The creator says the projects run on free hosting tiers and invites feedback on what to build next.

0
ProgrammingDEV Community ·

AI-assisted Riemann Hypothesis proof claim draws independent Lean checks, but is not yet accepted

Mathematician Levent Alpöge, working with Anthropic's Claude, said on November 20 that he had found a proof of the Riemann Hypothesis and believed the method could extend to the generalized version. On November 21, the Lean and Mathlib communities reported independent checks and expressed strong confidence in the proof of the original hypothesis. The work was shared as a formalization in 14 archive parts, roughly 17 million lines of code, rather than as a short human-readable explanation. The Clay Mathematics Institute still lists the problem as unsolved, and no Millennium Prize has been awarded. Experts note that a successful formal check is strong evidence but does not replace a complete global review or a readable explanation.

0
ProgrammingDEV Community ·

Developer shares how they built an art portfolio site with React and Flask

The author describes building a personal website to showcase their artwork while experimenting with new technologies. They chose a React frontend, opting for Create React App over Next.js, and a Python Flask backend to handle image uploads and user data. Early on, large image files slowed page loads, which they fixed by compressing images with tools like TinyPNG and adding lazy loading. They also struggled with CORS issues when connecting the frontend to the Flask API, which they resolved after adjusting headers.