Tagged articles

reflog

16 articles · Page 1 of 1
IT Xianyu
IT Xianyu
Jul 21, 2026 · Fundamentals

How I Rescued a Six‑File Git Merge Conflict in Three Simple Steps

When a merge of a feature branch produced six conflicted files that turned completely red, the author avoided a risky reset and resolved the conflict in under 30 seconds by using three precise Git commands, while also showing how to recover mistakenly deleted branches and lost stashes.

Command LineGitbest practices
0 likes · 8 min read
How I Rescued a Six‑File Git Merge Conflict in Three Simple Steps
Coder Trainee
Coder Trainee
Jul 20, 2026 · Fundamentals

Git Revert and Reset: A Rescue Guide for Mistakes

This article explains the differences between git reset, revert, and checkout, details the three reset modes (--soft, --mixed, --hard), shows when to use each command safely, provides practical scenarios, introduces reflog for recovery, and warns about common pitfalls.

Command LineGitcheckout
0 likes · 9 min read
Git Revert and Reset: A Rescue Guide for Mistakes
Top Architect
Top Architect
Oct 10, 2024 · Fundamentals

Practical Git Commands: stash, reset --soft, cherry-pick, revert, and reflog with Usage Scenarios

This article presents practical Git commands—including stash, reset --soft, cherry-pick, revert, and reflog—explaining their descriptions, typical use cases, and step‑by‑step examples, along with tips for configuring short aliases, helping developers efficiently manage code changes and recover from mistakes.

Gitreflogsoftware development
0 likes · 19 min read
Practical Git Commands: stash, reset --soft, cherry-pick, revert, and reflog with Usage Scenarios
Liangxu Linux
Liangxu Linux
Apr 26, 2020 · Fundamentals

Master Git: Visualize Merge, Rebase, Reset, Revert, and More with GIFs

This article provides a visual, step‑by‑step guide to essential Git commands—including merge (fast‑forward and no‑ff), rebase (including interactive mode), reset (soft and hard), revert, cherry‑pick, fetch, pull, and reflog—explaining their behavior, use cases, and common pitfalls with animated illustrations.

Gitcherry-pickfetch
0 likes · 12 min read
Master Git: Visualize Merge, Rebase, Reset, Revert, and More with GIFs
Programmer DD
Programmer DD
Jun 22, 2019 · Fundamentals

Master Git’s Hidden Tricks: Reflog, Commit Fixes, and Branch Recovery

While Git dominates version control with its distributed model and flexible branching, many developers still stumble over common pitfalls; this article collects real‑world problems—from recovering lost commits with reflog to fixing commit messages, undoing accidental master pushes, and understanding diff behavior—offering practical commands to resolve them.

CommitGitbranch recovery
0 likes · 5 min read
Master Git’s Hidden Tricks: Reflog, Commit Fixes, and Branch Recovery
ITPUB
ITPUB
Apr 24, 2018 · Fundamentals

12 Essential Git Tips to Supercharge Your Version Control

Discover twelve practical Git tricks—from configuring global and repository settings to using aliases, visualizing commit graphs, safe force‑pushes, and powerful add/checkout options—that can dramatically improve your workflow and efficiency.

Command LineGitWorkflow
0 likes · 14 min read
12 Essential Git Tips to Supercharge Your Version Control