Not Seeing How to Commit Changes Pulled
<!--

Have you read Kactus's Code of Conduct? By filing an Issue, you are
expected to comply with it, including treating everyone with respect:

https://github.com/kactus-io/kactus/blob/master/CODE_OF_CONDUCT.md

-->

<!--

Are you encountering an issue where the “Minimize” tooltip stays visible
when you click the minimize button in the window? If so, that is an issue
with Electron, the framework the app uses. Please subscribe to the issue
at this link for updates on the issue:

https://github.com/electron/electron/issues/9943

-->

<!--

Please summarize the issue in the title, and then use the template below to
fill out the details so we can reproduce the issue on our end.

-->

### Description

Testing things out with a team member and we're new to Git, so maybe we're doing something wrong here. I had a repository going that he was able to add to Kactus and pull down the Master. To test, he changed some text, committed and pushed to origin. I then fetched, thinking it would pull own and allow me to see and accept the changes. I see that there are changed files but I can't see how to accept them. If I commit to master, that accepts the changes, but then my team member gets in the same situation. It seems like it ends up in this strange commit loop.
![screen shot 2018-01-22 at 2 53 49 pm](https://user-images.githubusercontent.com/2135857/35248726-130e35dc-ff84-11e7-968a-f29e95b8582b.png)


Also, it seems to still be tracking the .sketch file even though I've verified that it's in the ignore file - at least it is in the repository settings.

![screen shot 2018-01-22 at 2 47 05 pm](https://user-images.githubusercontent.com/2135857/35248485-23395528-ff83-11e7-9ba1-7d325649856e.png)


### Version

<!--

What version of Kactus are you running? This is displayed under the
`About Kactus` menu item. If you are running from source, include
the commit by running `git rev-parse HEAD` from your local repository.

-->

**Kactus version:** 0.3.1

<!--

The operating system you are running on may also help with reproducing the
issue:

 - If you are on macOS, launch `About This Mac` and write down the OS version
   listed.
 - If you are on Windows, open `Command Prompt` and attach the output of this
   command: `cmd /c ver`

-->

**OS version:** 10.12.3 (16D32)

### Steps to Reproduce

1. Fetch a change from origin
2. See changed files
3. Not sure what to do here to not end up in a commit loop bouncing back and forth between team members.

<!--

If the issue involves a specific public repository, including the information
about that repository will make it is easier to recreate the issue.

If you think screenshots or a GIF recording will help demonstrate the issue
better, feel free to add them here.

-->

**Expected behavior:** I would expect that when I pull from the origin I would be able to see the changes and accept them, which would make my local master the same as the origin master so I wouldn't have to do a separate commit that then wants me to push to origin. 

**Actual behavior:** I fetch from origin, I see the changes. Only way I can see to accept those change is to commit them, which then informs me I can push to origin.

**Reproduces how often:** [What percentage of the time does it reproduce?]

### Logs

<!--

There may be some relevant information in log files generated by Kactus:

 - If you are on macOS, attach the most recent log file from:
   `~/Library/Application Support/Kactus/logs/*.kactus.production.log`
 - If you are on Windows, attach the most recent log file from:
   `%APPDATA%\Kactus\logs\*.kactus.production.log`

The log files are organized by date, so see if anything was generated for
today's date.

-->

#### Additional Information

Forgive me if I'm misunderstanding how this works, but it seems if I accept the origin master, it shouldn't ask me to push that right back to origin, I should just me able to accept the changes into my local master which would then match to origin master.
<!--

Any additional information, configuration or data that might be necessary to
reproduce the issue.

If you are dealing with a performance issue or regression, attaching a
[Timeline profile](https://github.com/kactus-io/kactus/blob/master/docs/contributing/timeline-profile.md)
of the task will help the developers understand the runtime behaviour of the
application on your machine.

-->
