{"action":"created","issue":{"url":"https://api.github.com/repos/git/git-scm.com/issues/635","labels_url":"https://api.github.com/repos/git/git-scm.com/issues/635/labels{/name}","comments_url":"https://api.github.com/repos/git/git-scm.com/issues/635/comments","events_url":"https://api.github.com/repos/git/git-scm.com/issues/635/events","html_url":"https://github.com/git/git-scm.com/issues/635","id":122702917,"number":635,"title":"single user causes conflicts without branching&merging","user":{"login":"adrian-herscu","id":2996545,"avatar_url":"https://avatars.githubusercontent.com/u/2996545?v=3","gravatar_id":"","url":"https://api.github.com/users/adrian-herscu","html_url":"https://github.com/adrian-herscu","followers_url":"https://api.github.com/users/adrian-herscu/followers","following_url":"https://api.github.com/users/adrian-herscu/following{/other_user}","gists_url":"https://api.github.com/users/adrian-herscu/gists{/gist_id}","starred_url":"https://api.github.com/users/adrian-herscu/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/adrian-herscu/subscriptions","organizations_url":"https://api.github.com/users/adrian-herscu/orgs","repos_url":"https://api.github.com/users/adrian-herscu/repos","events_url":"https://api.github.com/users/adrian-herscu/events{/privacy}","received_events_url":"https://api.github.com/users/adrian-herscu/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2015-12-17T10:11:11Z","updated_at":"2015-12-17T17:31:43Z","closed_at":null,"body":"I am working with a remote git repository, I am the only one who commits into that repository, and only into the master -- that is, no branching, no merging.\r\n\r\nMost of the time it works fine.\r\n\r\nBut sometimes, when I am trying to commit and push, I am getting some weird \"fast forward rejected\" message. Then, I am trying to synchronize by running git pull, I am getting my local copy into conflicted state :(\r\n\r\nLast time it corrupted one of my binary files.\r\n\r\nAny idea how that can happen that one user gets into conflicted state?"},"comment":{"url":"https://api.github.com/repos/git/git-scm.com/issues/comments/165522507","html_url":"https://github.com/git/git-scm.com/issues/635#issuecomment-165522507","issue_url":"https://api.github.com/repos/git/git-scm.com/issues/635","id":165522507,"user":{"login":"smith-kyle","id":5474861,"avatar_url":"https://avatars.githubusercontent.com/u/5474861?v=3","gravatar_id":"","url":"https://api.github.com/users/smith-kyle","html_url":"https://github.com/smith-kyle","followers_url":"https://api.github.com/users/smith-kyle/followers","following_url":"https://api.github.com/users/smith-kyle/following{/other_user}","gists_url":"https://api.github.com/users/smith-kyle/gists{/gist_id}","starred_url":"https://api.github.com/users/smith-kyle/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/smith-kyle/subscriptions","organizations_url":"https://api.github.com/users/smith-kyle/orgs","repos_url":"https://api.github.com/users/smith-kyle/repos","events_url":"https://api.github.com/users/smith-kyle/events{/privacy}","received_events_url":"https://api.github.com/users/smith-kyle/received_events","type":"User","site_admin":false},"created_at":"2015-12-17T17:31:43Z","updated_at":"2015-12-17T17:31:43Z","body":"This isn't really the spot for asking git related questions. The issues section of this repo is for reporting issues with [git-scm.com](https://git-scm.com/). I'd suggest looking [here](https://help.github.com/articles/dealing-with-non-fast-forward-errors/) to answer your fast forward question. Also in most cases you should be ignoring binaries in your `.gitignore`"}}