SShortSingh.
TopTechnologyAI & MLStartupsProgrammingScienceBusinessFinanceCrypto & Web3World
Back to feed
Programming

How git pull --rebase can silently delete your commit and how to recover it

0
·1 views

A common Git workflow hazard occurs when a teammate force-pushes to a shared branch, overwriting commits that others have already pushed. Running git pull --rebase after such a force-push can silently drop your commit, with all status indicators appearing normal. The lost commit is recoverable using the branch's reflog, which logs every state the branch has held locally, allowing a git reset --hard to restore it. Once recovered, the divergence between local and remote branches must be resolved properly before pushing again. The root cause lies in how git pull uses the --fork-point option during rebase, which can exclude commits rewritten by a force-push from the set of changes to replay.

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 ·

JetBrains Launches Kotlin AI Benchmark; Token Efficiency Varies 12x Across Top Agents

JetBrains has released the Kotlin Benchmark, an official leaderboard that evaluates AI coding agents on 105 real engineering tasks drawn from active open-source Kotlin repositories. Claude Code with Opus 4.7 xhigh topped the leaderboard with an 85.7% resolution rate, followed closely by JetBrains Junie and OpenAI Codex at 81.9%. However, the benchmark reveals a striking 12x gap in token consumption per solved task across the top 20 configurations, meaning some lower-ranked setups solve nearly as many tasks at a fraction of the cost. The benchmark follows SWE-bench methodology, verifying solutions in containerized environments using each repository's own tests, with no self-reporting. JetBrains has published the datasets, test harnesses, and GitHub repository openly, aiming to fill a gap left by generic benchmarks that previously underserved the Kotlin ecosystem.

0 comments Read more at DEV Community
0
ProgrammingDEV Community ·

Dev Tutorial: Adding PostgreSQL Persistence to a NestJS Choose-Your-Own-Adventure API

A developer series called 'Grimoire API' is building a choose-your-own-adventure backend using NestJS, with Part 2 focusing on data persistence across server restarts. The tutorial introduces PostgreSQL paired with TypeORM as the database layer, run locally via Docker Compose for easy setup and teardown. A PlayerProgress entity is created to track each user's current story page and XP, mapping directly to a database table through TypeORM decorators. Notably, the design deliberately omits a stored 'level' column, deriving it from XP at runtime to prevent data inconsistencies. The module wires everything together using NestJS's dependency injection pattern, making the player progress repository available through TypeOrmModule.forFeature.

0 comments Read more at DEV Community
0
ProgrammingDEV Community ·

How Sentry was configured to show user journey funnels, not just stack traces

A development team found that despite having Sentry installed and tracking errors, no one could determine whether checkout failures stemmed from the payment step, coupon logic, or a tracking pixel. The core problem was that installation was mistaken for instrumentation — raw stack traces were being captured without context about what the user was actually doing. The team restructured their error events to include domain, phase, and action fields, allowing engineers and product managers to filter by user action before ever opening a stack trace. This change made it possible to distinguish revenue-threatening failures from post-sale noise within the same dashboard. As a result, checkout conversion data became visible alongside error data, aligning engineering alerts directly with product OKRs.

0 comments Read more at DEV Community
0
ProgrammingDEV Community ·

How fixing checkout timeouts during influencer campaigns lifted conversions by 10%

A developer on a high-traffic infoproduct checkout platform discovered that conversion rates were dropping during influencer campaigns because the micro frontend architecture was forcing users' browsers to download excessive JavaScript before the payment button could load. The root cause was identified using Sentry and Datadog observability tools, which revealed that payment-step JS was timing out on mobile devices under peak traffic — sessions were dying before the POST request could complete. The team addressed the problem by implementing server-side rendering via an existing BFF layer, loading JavaScript on demand, and optimising CDN delivery so only the current step's code loaded upfront. Results were measured not through Lighthouse lab scores but through backoffice sales data cross-referenced with Sentry and Datadog metrics, confirming a 10% increase in conversions within the month. The engineer credited the outcome to aligning observability tooling with product OKRs and real sales metrics, and noted the result contributed to their promotion to Staff Engineer II.

0 comments Read more at DEV Community
How git pull --rebase can silently delete your commit and how to recover it · ShortSingh