kater git pull

It takes a new snapshot of everything you can read, and merges it into your branch with a real git merge.

Examples

# Go to your local copy
cd ~/kater
# Bring in what other people published since your last pull
kater git pull

Options

It also takes --help.

Conflicts and access

• Run it in your copy. It works in any folder of your local copy. Outside one, it asks you to run kater git clone first.
• Ordinary conflicts. When a file changed in Kater and in your copy, git can mark a conflict. Resolve it, git add the files and git commit, as in any git repository.
• Finish a merge first. A pull stops while a merge is in progress. Resolve the conflicts and commit, or run git merge --abort.
• Access follows you. Files that you can no longer read leave your copy at the next pull.
• Files from elsewhere stay. A pull deletes a file only when Kater sent it before and does not send it now. A file that Kater never sent, such as a file that you added and did not push, stays as your branch has it.
• The exit code is git’s. When the merge stops for a conflict, the command exits with the code that git gives.

See also

• kater git
• All commands