Avoid mention branches at our novice lesson about Git

[rgaiacs]

In our novice lesson about conflict we say "branch" at

It is now up to us to edit this file to remove these markers and reconcile the changes. We can do anything we want: keep the change in this branch, keep the change made in the other, write something new to replace both, or get rid of the change entirely. Let's replace both so that the file looks like this:

I want to replace "branch" with something else in this paragraph but before that will love to have some suggestions.

[ctjacobs]

Perhaps use "local copy (of the repository)" instead, or be explicit and say "keep the change in the local /tmp/planets repository"?

[wking]

On Sat, Aug 02, 2014 at 01:56:50PM -0700, Christian Jacobs wrote:

Perhaps use "local copy (of the repository)" instead, or be explicit and say "keep the change in the local /tmp/planets repository"?

I like this idea. My preferred phrasing would be:

We can do anything we want: keep the change make in the local repository, keep the change made in the remote repository, write something new to replace both, or get rid of the change entirely.

This conflates repositories and branches, but that's the existing novice approach.