{"action":"closed","issue":{"url":"https://api.github.com/repos/GotelliLab/EcoSimR/issues/61","labels_url":"https://api.github.com/repos/GotelliLab/EcoSimR/issues/61/labels{/name}","comments_url":"https://api.github.com/repos/GotelliLab/EcoSimR/issues/61/comments","events_url":"https://api.github.com/repos/GotelliLab/EcoSimR/issues/61/events","html_url":"https://github.com/GotelliLab/EcoSimR/issues/61","id":61708674,"number":61,"title":"Merge conflicts","user":{"login":"ngotelli","id":4925690,"avatar_url":"https://avatars.githubusercontent.com/u/4925690?v=3","gravatar_id":"","url":"https://api.github.com/users/ngotelli","html_url":"https://github.com/ngotelli","followers_url":"https://api.github.com/users/ngotelli/followers","following_url":"https://api.github.com/users/ngotelli/following{/other_user}","gists_url":"https://api.github.com/users/ngotelli/gists{/gist_id}","starred_url":"https://api.github.com/users/ngotelli/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ngotelli/subscriptions","organizations_url":"https://api.github.com/users/ngotelli/orgs","repos_url":"https://api.github.com/users/ngotelli/repos","events_url":"https://api.github.com/users/ngotelli/events{/privacy}","received_events_url":"https://api.github.com/users/ngotelli/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":{"login":"emhart","id":1039395,"avatar_url":"https://avatars.githubusercontent.com/u/1039395?v=3","gravatar_id":"","url":"https://api.github.com/users/emhart","html_url":"https://github.com/emhart","followers_url":"https://api.github.com/users/emhart/followers","following_url":"https://api.github.com/users/emhart/following{/other_user}","gists_url":"https://api.github.com/users/emhart/gists{/gist_id}","starred_url":"https://api.github.com/users/emhart/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/emhart/subscriptions","organizations_url":"https://api.github.com/users/emhart/orgs","repos_url":"https://api.github.com/users/emhart/repos","events_url":"https://api.github.com/users/emhart/events{/privacy}","received_events_url":"https://api.github.com/users/emhart/received_events","type":"User","site_admin":false},"milestone":null,"comments":9,"created_at":"2015-03-14T22:49:48Z","updated_at":"2015-03-17T04:35:15Z","closed_at":"2015-03-17T04:35:15Z","body":"Hi @emhart \r\n\r\nI worked today on the co-occurrence and niche overlaps vignettes. I was able to stage and commit these changes on my machine, but when I tried to push them to the remote repository, there was a conflict. What should I be doing differently to avoid this? Thanks!\r\n\r\nN.\r\n\r\n:dog: :walking: then :cocktail: "}}