git config — 2 Technical Articles

Mar 22, 2024 · Fundamentals

How to Resolve Git Branch Divergence: Merge, Rebase, or Fast‑Forward?

When pulling changes, Git may report divergent branches, and this guide explains three strategies—merge, rebase, and fast‑forward—detailing their commands, effects, pros and cons, plus how to set a default behavior globally or per repository.

Gitbranch-divergencefast-forward

0 likes · 5 min read

How to Resolve Git Branch Divergence: Merge, Rebase, or Fast‑Forward?

Code Ape Tech Column

Jan 22, 2021 · Fundamentals

Master Essential Git Commands: Inspection, Reverting, Cleanup, and Shortcuts

This guide walks developers through the most useful Git commands for inspecting changes, safely reverting commits, cleaning untracked files, customizing the default editor, and creating handy Bash aliases, providing clear examples, code snippets, and practical tips to streamline version‑control workflows.

Command-lineGitVim

0 likes · 9 min read

Master Essential Git Commands: Inspection, Reverting, Cleanup, and Shortcuts