| CARVIEW |
Select Language
HTTP/2 302
server: nginx
date: Mon, 22 Dec 2025 16:12:07 GMT
content-type: text/plain; charset=utf-8
content-length: 0
x-archive-redirect-reason: found capture at 20091006030645
location: https://web.archive.org/web/20091006030645/https://gitcasts.com/posts/branching-and-merging
server-timing: captures_list;dur=0.519927, exclusion.robots;dur=0.047175, exclusion.robots.policy;dur=0.036791, esindex;dur=0.010875, cdx.remote;dur=10.389131, LoadShardBlock;dur=148.426394, PetaboxLoader3.datanode;dur=85.948211, PetaboxLoader3.resolve;dur=30.919992
x-app-server: wwwb-app224-dc8
x-ts: 302
x-tr: 182
server-timing: TR;dur=0,Tw;dur=0,Tc;dur=0
set-cookie: wb-p-SERVER=wwwb-app224; path=/
x-location: All
x-as: 14061
x-rl: 0
x-na: 0
x-page-cache: MISS
server-timing: MISS
x-nid: DigitalOcean
referrer-policy: no-referrer-when-downgrade
permissions-policy: interest-cohort=()
HTTP/2 200
server: nginx
date: Mon, 22 Dec 2025 16:12:07 GMT
content-type: text/html
x-archive-orig-date: Tue, 06 Oct 2009 03:06:45 GMT
x-archive-orig-server: Apache/2.2.8 (Ubuntu) Phusion_Passenger/1.0.5
x-archive-orig-last-modified: Wed, 30 Sep 2009 08:18:11 GMT
x-archive-orig-etag: "bd0da-149f-474c72beb56c0"
x-archive-orig-accept-ranges: bytes
x-archive-orig-content-length: 5279
x-archive-orig-connection: close
x-archive-guessed-content-type: text/html
x-archive-guessed-charset: utf-8
memento-datetime: Tue, 06 Oct 2009 03:06:45 GMT
link: ; rel="original", ; rel="timemap"; type="application/link-format", ; rel="timegate"
content-security-policy: default-src 'self' 'unsafe-eval' 'unsafe-inline' data: blob: archive.org web.archive.org web-static.archive.org wayback-api.archive.org athena.archive.org analytics.archive.org pragma.archivelab.org wwwb-events.archive.org
x-archive-src: 51_12_20091005143016_crawl100_IndexOnly-c/51_12_20091006030638_crawl102.arc.gz
server-timing: captures_list;dur=0.655919, exclusion.robots;dur=0.023706, exclusion.robots.policy;dur=0.011039, esindex;dur=0.013224, cdx.remote;dur=6.165432, LoadShardBlock;dur=125.903428, PetaboxLoader3.datanode;dur=119.696930, PetaboxLoader3.resolve;dur=112.318425, load_resource;dur=174.312534
x-app-server: wwwb-app224-dc8
x-ts: 200
x-tr: 347
server-timing: TR;dur=0,Tw;dur=0,Tc;dur=1
x-location: All
x-as: 14061
x-rl: 0
x-na: 0
x-page-cache: MISS
server-timing: MISS
x-nid: DigitalOcean
referrer-policy: no-referrer-when-downgrade
permissions-policy: interest-cohort=()
content-encoding: gzip
“Branching and Merging” at GitCasts
Click here to go home
Powered by aintablog
The Git User's Survey 2008 is up! Please fill it out so we can improve Git!
To support GitCasts please consider buying my Git Internals book published by Peepcode Press.
GitHub: Social Git hosting, a home for your codes.
Branching and Merging
May
28
In this screencast, we take you through a workflow where we branch, stash and merge several times. It demonstrates the branch and show-branch commands, how to switch branches, how to stash changes, how to list and apply stashes, how to resolve conflicts, how to create and delete topic branches, and what fast-forward merges are.