title: Git Branch & Origin/Master Diverge
body: <p>I have a file on Github that I want to update, as I have added new stuff to my local file. I did the git add, commit, &amp; push origin master. The add &amp; commit worked fine but push origin master is not working.</p>
  
  <p>This is what I get when I try to do push origin master:</p>
  
  <pre><code>    $ git push origin master
      To https://github.com/AhmaadJ/ChatBot-Lite.git
       ! [rejected]        master -&gt; master (non-fast-forward)
      error: failed to push some refs to 'https://github.com/AhmaadJ/ChatBot-Lite.git'
      hint: Updates were rejected because the tip of your current branch is behind
      hint: its remote counterpart. Integrate the remote changes (e.g.
      hint: 'git pull ...') before pushing again.
      hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  </code></pre>
  
  <p>I did git pull, than did some stuff that I also found online for similar problems, &amp; I got a merge conflict. I aborted the merge, &amp; checked the status, log, &amp; remote to see what is the problem. </p>
  
  <p>Here's what status brought up:</p>
  
  <pre><code>    $ git status
      On branch master
      Your branch and 'origin/master' have diverged,
      and have 3 and 3 different commits each, respectively.
        (use "git pull" to merge the remote branch into yours)
  
      nothing to commit, working tree clean
  </code></pre>
  
  <p>Should I undo my latest commit? If so, how?</p>
  
  <p>I'll also link pictures of the code below:</p>
  
  <p>Pictures Contain:</p>
  
  <p>-Drawing Diagram</p>
  
  <p>-Pull, Branch, Merge Abort</p>
  
  <p>-Log, Status</p>
  
  <p>-Log, Pull, Status</p>
  
  <p>-Status, Log, Branch, Remote -v</p>
  
  <p><a href="https://imgur.com/a/U4oBUOA" rel="nofollow noreferrer">Images</a>
  <a href="https://imgur.com/a/XE2bvnY" rel="nofollow noreferrer">Files changed within the commit</a></p>