title: Why am I getting a commit error on IntelliJ - Commit failed with error
body: <p>I'm using IntelliJ IDEA and I'm not sure where I'm going wrong, but I have another coder working on a section of an app (a branch called "additionalwork") that is on GitHub. All I want to do is to look at what he's doing before merging what he's done into the master branch. For some reason, when I make changes to my code and try to commit, I get an error:</p>
  
  <p><a href="https://i.stack.imgur.com/jS7oZ.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/jS7oZ.png" alt="enter image description here"></a></p>
  
  <p>Could someone tell me the steps I should be doing (or avoiding) so that I can not only work on my section of code, but view the other branch and then merge into the master branch if everything is ok with the other coder's work?</p>