{"action":"created","issue":{"url":"https://api.github.com/repos/ingrid3lias/bloc-jams-angular/issues/4","labels_url":"https://api.github.com/repos/ingrid3lias/bloc-jams-angular/issues/4/labels{/name}","comments_url":"https://api.github.com/repos/ingrid3lias/bloc-jams-angular/issues/4/comments","events_url":"https://api.github.com/repos/ingrid3lias/bloc-jams-angular/issues/4/events","html_url":"https://github.com/ingrid3lias/bloc-jams-angular/pull/4","id":120931598,"number":4,"title":"Checkpoint 3 completed, Routing and States","user":{"login":"ingrid3lias","id":13096941,"avatar_url":"https://avatars.githubusercontent.com/u/13096941?v=3","gravatar_id":"","url":"https://api.github.com/users/ingrid3lias","html_url":"https://github.com/ingrid3lias","followers_url":"https://api.github.com/users/ingrid3lias/followers","following_url":"https://api.github.com/users/ingrid3lias/following{/other_user}","gists_url":"https://api.github.com/users/ingrid3lias/gists{/gist_id}","starred_url":"https://api.github.com/users/ingrid3lias/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ingrid3lias/subscriptions","organizations_url":"https://api.github.com/users/ingrid3lias/orgs","repos_url":"https://api.github.com/users/ingrid3lias/repos","events_url":"https://api.github.com/users/ingrid3lias/events{/privacy}","received_events_url":"https://api.github.com/users/ingrid3lias/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":2,"created_at":"2015-12-08T05:04:46Z","updated_at":"2015-12-08T09:24:22Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/ingrid3lias/bloc-jams-angular/pulls/4","html_url":"https://github.com/ingrid3lias/bloc-jams-angular/pull/4","diff_url":"https://github.com/ingrid3lias/bloc-jams-angular/pull/4.diff","patch_url":"https://github.com/ingrid3lias/bloc-jams-angular/pull/4.patch"},"body":"Hey @matstc !\r\n\r\nI was attempting to merge this branch with the master from terminal, since it was not an assignment, and when I tried to merge with the master, an alert came up in terminal about the dist/ files:\r\n\r\n```\r\nerror: Your local changes to the following files would be overwritten by merge:\r\n\tdist/index.html\r\n\tdist/scripts/app.js\r\nPlease, commit your changes or stash them before you can merge.\r\nerror: The following untracked working tree files would be overwritten by merge:\r\n```\r\nAnd I was wondering why that it happening? Is it because I ran ```grunt``` before starting on the checkpoint? Am I supposed to activate grunt before I start working so that it's always \"watching\" or am I supposed to do that separately/after?\r\n\r\nThank you!"},"comment":{"url":"https://api.github.com/repos/ingrid3lias/bloc-jams-angular/issues/comments/162825392","html_url":"https://github.com/ingrid3lias/bloc-jams-angular/pull/4#issuecomment-162825392","issue_url":"https://api.github.com/repos/ingrid3lias/bloc-jams-angular/issues/4","id":162825392,"user":{"login":"ingrid3lias","id":13096941,"avatar_url":"https://avatars.githubusercontent.com/u/13096941?v=3","gravatar_id":"","url":"https://api.github.com/users/ingrid3lias","html_url":"https://github.com/ingrid3lias","followers_url":"https://api.github.com/users/ingrid3lias/followers","following_url":"https://api.github.com/users/ingrid3lias/following{/other_user}","gists_url":"https://api.github.com/users/ingrid3lias/gists{/gist_id}","starred_url":"https://api.github.com/users/ingrid3lias/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ingrid3lias/subscriptions","organizations_url":"https://api.github.com/users/ingrid3lias/orgs","repos_url":"https://api.github.com/users/ingrid3lias/repos","events_url":"https://api.github.com/users/ingrid3lias/events{/privacy}","received_events_url":"https://api.github.com/users/ingrid3lias/received_events","type":"User","site_admin":false},"created_at":"2015-12-08T09:24:22Z","updated_at":"2015-12-08T09:24:22Z","body":"hmmm..... i tried deleting them.... and then just ended up making a mess of my merges/commits. :( \r\n```\r\n~/bloc/bloc-jams-angular$ git status\r\nOn branch master\r\nYour branch is up-to-date with 'origin/master'.\r\n\r\nYou have unmerged paths.\r\n  (fix conflicts and run \"git commit\")\r\n\r\nChanges to be committed:\r\n\r\n\tmodified:   app/pages/index.html\r\n\tmodified:   app/scripts/app.js\r\n\tmodified:   app/styles/landing.css\r\n\tnew file:   app/templates/album.html\r\n\tnew file:   app/templates/collection.html\r\n\tdeleted:    app/templates/home.html\r\n\tnew file:   app/templates/landing.html\r\n\tmodified:   dist/scripts/app.js\r\n\tnew file:   dist/templates/album.html\r\n\tnew file:   dist/templates/collection.html\r\n\tdeleted:    dist/templates/home.html\r\n\tnew file:   dist/templates/landing.html\r\n\r\nUnmerged paths:\r\n  (use \"git add/rm <file>...\" as appropriate to mark resolution)\r\n\r\n\tdeleted by us:   dist/index.html\r\n\tboth added:      dist/styles/landing.css\r\n\r\n~/bloc/bloc-jams-angular$ git commit\r\nU\tdist/index.html\r\nU\tdist/styles/landing.css\r\nerror: 'commit' is not possible because you have unmerged files.\r\nhint: Fix them up in the work tree,\r\nhint: and then use 'git add/rm <file>' as\r\nhint: appropriate to mark resolution and make a commit,\r\nhint: or use 'git commit -a'.\r\nfatal: Exiting because of an unresolved conflict.\r\n~/bloc/bloc-jams-angular$ git rm dist/index.html\r\ndist/index.html: needs merge\r\nrm 'dist/index.html'\r\n~/bloc/bloc-jams-angular$ git merge\r\nerror: 'merge' is not possible because you have unmerged files.\r\nhint: Fix them up in the work tree,\r\nhint: and then use 'git add/rm <file>' as\r\nhint: appropriate to mark resolution and make a commit,\r\nhint: or use 'git commit -a'.\r\nfatal: Exiting because of an unresolved conflict.\r\n```"}}