I'm on the master branch, and want to work on a new feature so I do:

```
git checkout -b new_feature

```

Now I am coding, doing a git status shows the files modified.

If I try and move to the master branch it says I can't b/c of the files that were updated.

ok so i'll add them:

```
git add -A

```

now if I try and jump to the master branch, it seems to be wanted to merge???

```
git checkout master

```

What I want to know how to do is:

1. while in another branch, I want to stop what I am doing and move to the master branch, not merging anything yet, I just want to stop working on the new feature branch and go back to master.