Let's try some branching. This workflow would be as if you were working in a solo project.
You are a cat blogger. You are writing an entry in your cat blog. Save the blog as a commit in git.
- Create a new repo:
mkdir catworld
cd catworld
echo "Sweet beast yowling nonstop the whole night or lie on your belly and purr when you are asleep yet scratch at fleas, meow until belly rubs, hide behind curtain when vacuum cleaner is on scratch strangers and poo on owners food unwrap toilet paper. Ears back wide eyed pooping rainbow while flying in a toasted bread costume in space this human feeds me, i should be a god yet hide head under blanket so no one can see." >> text-sample.txt
git add .
git commit -m "initial commit"
You wrote a blog, but you are thinking it needs some edits. You want to keep your old blog, but want to see if the new editorial direction for your blog entry is good.
- Check out a new feature branch and add another line to the file.
git branch new-line
git checkout new-line
Make the changes:
sublime text-sample.txt
Merge your changes back into master
git checkout master
Now that you are in your master branch, see the current state of the file.
git merge new-line
export VISUAL=sublime
export EDITOR="$VISUAL"