Re: Patch to make README more newbie-friendly

Hi, Jerry Seutter wrote:

Cogito branch creation is based on the idea that you have a different archive _somewhere_else_ that you pull from, so it wants to store the source URL in .git/branches/<name>.

Git doesn't have that assumption; "git checkout -b <name>" simply creates a new branch and switches to it. However, the git branch idea came somewhat later, so there's a bit of a mismatch at the moment.

Simply switching branches isn't supposed to have any effect unless you actually have changes in different branches. I tend to work along these lines:

#!/bin/sh

cd /tmp rm -rf test.$$ mkdir test.$$ cd test.$$ git-init-db echo not-quite-empty >testfile cg-add testfile echo Created test | cg-commit git checkout -b one echo foo >>testfile echo added foo to testfile | cg-commit git checkout -b two master echo bar >> testfile echo added bar to testfile | cg-commit cg-diff -r one:two | cat git checkout master cg-merge one cg-merge two

The first merge fast-forwards your master tree to "one"; the second creates a conflict (lines were added at the same location) which you'll have to resolve (edit the file).

vi testfile echo Merged one and two | cg-commit gitk