{"action":"created","comment":{"url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/pulls/comments/81470033","pull_request_review_id":2448957,"id":81470033,"diff_hunk":"@@ -139,6 +139,52 @@ In our case, our project has the next structure:\n \n As we can see our project follows Mavens directory layout. There are some directories in the layout that aren't present in our project structure but this is because our project source doesn't use anything from those directories since they are generated at building time.\n \n+#HOW TO RESOLVE CONFLICTS IN GIT\n+The first question that we've to do ourselves is, what is a conflict?\n+\n+A conflict is the modification of the same line or lines by two or more users. A conflict appears when we try to merge branches.\n+It's important to know how many branches we have in our repository. With `git log` we can see the commit's history, with\n+`git log --oneline` we get the same result but in a short version. But, with `git log --graph --oneline` we get a graphic\n+vision of our commits and branches. Also it exists the command `git show-branch -a` that shows all the repository branches.\n+\n+When a conflict happens, the console result is like this\n+\n+```\n+","path":"description.md","position":15,"original_position":15,"commit_id":"5e7fbe99f4daa3813fec8a0058b297650471d8d0","original_commit_id":"5e7fbe99f4daa3813fec8a0058b297650471d8d0","user":{"login":"fjlopez","id":3294927,"avatar_url":"https://avatars.githubusercontent.com/u/3294927?v=3","gravatar_id":"","url":"https://api.github.com/users/fjlopez","html_url":"https://github.com/fjlopez","followers_url":"https://api.github.com/users/fjlopez/followers","following_url":"https://api.github.com/users/fjlopez/following{/other_user}","gists_url":"https://api.github.com/users/fjlopez/gists{/gist_id}","starred_url":"https://api.github.com/users/fjlopez/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fjlopez/subscriptions","organizations_url":"https://api.github.com/users/fjlopez/orgs","repos_url":"https://api.github.com/users/fjlopez/repos","events_url":"https://api.github.com/users/fjlopez/events{/privacy}","received_events_url":"https://api.github.com/users/fjlopez/received_events","type":"User","site_admin":false},"body":"Remove extra line","created_at":"2016-10-02T13:23:45Z","updated_at":"2016-10-02T13:23:45Z","html_url":"https://github.com/UNIZAR-30246-WebEngineering/lab1-git-race/pull/53#discussion_r81470033","pull_request_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/pulls/53","_links":{"self":{"href":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/pulls/comments/81470033"},"html":{"href":"https://github.com/UNIZAR-30246-WebEngineering/lab1-git-race/pull/53#discussion_r81470033"},"pull_request":{"href":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/pulls/53"}}},"pull_request":{"url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/pulls/53","id":87606566,"html_url":"https://github.com/UNIZAR-30246-WebEngineering/lab1-git-race/pull/53","diff_url":"https://github.com/UNIZAR-30246-WebEngineering/lab1-git-race/pull/53.diff","patch_url":"https://github.com/UNIZAR-30246-WebEngineering/lab1-git-race/pull/53.patch","issue_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/issues/53","number":53,"state":"open","locked":false,"title":"Added a short tutorial to resolve conflicts","user":{"login":"danirueda","id":16139263,"avatar_url":"https://avatars.githubusercontent.com/u/16139263?v=3","gravatar_id":"","url":"https://api.github.com/users/danirueda","html_url":"https://github.com/danirueda","followers_url":"https://api.github.com/users/danirueda/followers","following_url":"https://api.github.com/users/danirueda/following{/other_user}","gists_url":"https://api.github.com/users/danirueda/gists{/gist_id}","starred_url":"https://api.github.com/users/danirueda/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/danirueda/subscriptions","organizations_url":"https://api.github.com/users/danirueda/orgs","repos_url":"https://api.github.com/users/danirueda/repos","events_url":"https://api.github.com/users/danirueda/events{/privacy}","received_events_url":"https://api.github.com/users/danirueda/received_events","type":"User","site_admin":false},"body":"I've added a short tutorial that teachs how to fix git conflicts resolving issue #45 ","created_at":"2016-10-01T16:14:28Z","updated_at":"2016-10-02T13:32:11Z","closed_at":null,"merged_at":null,"merge_commit_sha":"b8364fffcbec000b1f7b477f40247144c0c5fcfb","assignee":{"login":"fjlopez","id":3294927,"avatar_url":"https://avatars.githubusercontent.com/u/3294927?v=3","gravatar_id":"","url":"https://api.github.com/users/fjlopez","html_url":"https://github.com/fjlopez","followers_url":"https://api.github.com/users/fjlopez/followers","following_url":"https://api.github.com/users/fjlopez/following{/other_user}","gists_url":"https://api.github.com/users/fjlopez/gists{/gist_id}","starred_url":"https://api.github.com/users/fjlopez/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fjlopez/subscriptions","organizations_url":"https://api.github.com/users/fjlopez/orgs","repos_url":"https://api.github.com/users/fjlopez/repos","events_url":"https://api.github.com/users/fjlopez/events{/privacy}","received_events_url":"https://api.github.com/users/fjlopez/received_events","type":"User","site_admin":false},"assignees":[{"login":"fjlopez","id":3294927,"avatar_url":"https://avatars.githubusercontent.com/u/3294927?v=3","gravatar_id":"","url":"https://api.github.com/users/fjlopez","html_url":"https://github.com/fjlopez","followers_url":"https://api.github.com/users/fjlopez/followers","following_url":"https://api.github.com/users/fjlopez/following{/other_user}","gists_url":"https://api.github.com/users/fjlopez/gists{/gist_id}","starred_url":"https://api.github.com/users/fjlopez/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fjlopez/subscriptions","organizations_url":"https://api.github.com/users/fjlopez/orgs","repos_url":"https://api.github.com/users/fjlopez/repos","events_url":"https://api.github.com/users/fjlopez/events{/privacy}","received_events_url":"https://api.github.com/users/fjlopez/received_events","type":"User","site_admin":false}],"milestone":null,"commits_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/pulls/53/commits","review_comments_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/pulls/53/comments","review_comment_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/pulls/comments{/number}","comments_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/issues/53/comments","statuses_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/statuses/5e7fbe99f4daa3813fec8a0058b297650471d8d0","head":{"label":"danirueda:master","ref":"master","sha":"5e7fbe99f4daa3813fec8a0058b297650471d8d0","user":{"login":"danirueda","id":16139263,"avatar_url":"https://avatars.githubusercontent.com/u/16139263?v=3","gravatar_id":"","url":"https://api.github.com/users/danirueda","html_url":"https://github.com/danirueda","followers_url":"https://api.github.com/users/danirueda/followers","following_url":"https://api.github.com/users/danirueda/following{/other_user}","gists_url":"https://api.github.com/users/danirueda/gists{/gist_id}","starred_url":"https://api.github.com/users/danirueda/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/danirueda/subscriptions","organizations_url":"https://api.github.com/users/danirueda/orgs","repos_url":"https://api.github.com/users/danirueda/repos","events_url":"https://api.github.com/users/danirueda/events{/privacy}","received_events_url":"https://api.github.com/users/danirueda/received_events","type":"User","site_admin":false},"repo":{"id":69228736,"name":"lab1-git-race","full_name":"danirueda/lab1-git-race","owner":{"login":"danirueda","id":16139263,"avatar_url":"https://avatars.githubusercontent.com/u/16139263?v=3","gravatar_id":"","url":"https://api.github.com/users/danirueda","html_url":"https://github.com/danirueda","followers_url":"https://api.github.com/users/danirueda/followers","following_url":"https://api.github.com/users/danirueda/following{/other_user}","gists_url":"https://api.github.com/users/danirueda/gists{/gist_id}","starred_url":"https://api.github.com/users/danirueda/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/danirueda/subscriptions","organizations_url":"https://api.github.com/users/danirueda/orgs","repos_url":"https://api.github.com/users/danirueda/repos","events_url":"https://api.github.com/users/danirueda/events{/privacy}","received_events_url":"https://api.github.com/users/danirueda/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/danirueda/lab1-git-race","description":"Laboratory 1 - Git Race (deadline 07/Oct)","fork":true,"url":"https://api.github.com/repos/danirueda/lab1-git-race","forks_url":"https://api.github.com/repos/danirueda/lab1-git-race/forks","keys_url":"https://api.github.com/repos/danirueda/lab1-git-race/keys{/key_id}","collaborators_url":"https://api.github.com/repos/danirueda/lab1-git-race/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/danirueda/lab1-git-race/teams","hooks_url":"https://api.github.com/repos/danirueda/lab1-git-race/hooks","issue_events_url":"https://api.github.com/repos/danirueda/lab1-git-race/issues/events{/number}","events_url":"https://api.github.com/repos/danirueda/lab1-git-race/events","assignees_url":"https://api.github.com/repos/danirueda/lab1-git-race/assignees{/user}","branches_url":"https://api.github.com/repos/danirueda/lab1-git-race/branches{/branch}","tags_url":"https://api.github.com/repos/danirueda/lab1-git-race/tags","blobs_url":"https://api.github.com/repos/danirueda/lab1-git-race/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/danirueda/lab1-git-race/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/danirueda/lab1-git-race/git/refs{/sha}","trees_url":"https://api.github.com/repos/danirueda/lab1-git-race/git/trees{/sha}","statuses_url":"https://api.github.com/repos/danirueda/lab1-git-race/statuses/{sha}","languages_url":"https://api.github.com/repos/danirueda/lab1-git-race/languages","stargazers_url":"https://api.github.com/repos/danirueda/lab1-git-race/stargazers","contributors_url":"https://api.github.com/repos/danirueda/lab1-git-race/contributors","subscribers_url":"https://api.github.com/repos/danirueda/lab1-git-race/subscribers","subscription_url":"https://api.github.com/repos/danirueda/lab1-git-race/subscription","commits_url":"https://api.github.com/repos/danirueda/lab1-git-race/commits{/sha}","git_commits_url":"https://api.github.com/repos/danirueda/lab1-git-race/git/commits{/sha}","comments_url":"https://api.github.com/repos/danirueda/lab1-git-race/comments{/number}","issue_comment_url":"https://api.github.com/repos/danirueda/lab1-git-race/issues/comments{/number}","contents_url":"https://api.github.com/repos/danirueda/lab1-git-race/contents/{+path}","compare_url":"https://api.github.com/repos/danirueda/lab1-git-race/compare/{base}...{head}","merges_url":"https://api.github.com/repos/danirueda/lab1-git-race/merges","archive_url":"https://api.github.com/repos/danirueda/lab1-git-race/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/danirueda/lab1-git-race/downloads","issues_url":"https://api.github.com/repos/danirueda/lab1-git-race/issues{/number}","pulls_url":"https://api.github.com/repos/danirueda/lab1-git-race/pulls{/number}","milestones_url":"https://api.github.com/repos/danirueda/lab1-git-race/milestones{/number}","notifications_url":"https://api.github.com/repos/danirueda/lab1-git-race/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/danirueda/lab1-git-race/labels{/name}","releases_url":"https://api.github.com/repos/danirueda/lab1-git-race/releases{/id}","deployments_url":"https://api.github.com/repos/danirueda/lab1-git-race/deployments","created_at":"2016-09-26T08:22:30Z","updated_at":"2016-09-26T08:22:32Z","pushed_at":"2016-10-01T16:03:57Z","git_url":"git://github.com/danirueda/lab1-git-race.git","ssh_url":"git@github.com:danirueda/lab1-git-race.git","clone_url":"https://github.com/danirueda/lab1-git-race.git","svn_url":"https://github.com/danirueda/lab1-git-race","homepage":"","size":163,"stargazers_count":0,"watchers_count":0,"language":"Java","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"UNIZAR-30246-WebEngineering:master","ref":"master","sha":"f2699e495a21697b035824aa62bf15090f94da41","user":{"login":"UNIZAR-30246-WebEngineering","id":8750189,"avatar_url":"https://avatars.githubusercontent.com/u/8750189?v=3","gravatar_id":"","url":"https://api.github.com/users/UNIZAR-30246-WebEngineering","html_url":"https://github.com/UNIZAR-30246-WebEngineering","followers_url":"https://api.github.com/users/UNIZAR-30246-WebEngineering/followers","following_url":"https://api.github.com/users/UNIZAR-30246-WebEngineering/following{/other_user}","gists_url":"https://api.github.com/users/UNIZAR-30246-WebEngineering/gists{/gist_id}","starred_url":"https://api.github.com/users/UNIZAR-30246-WebEngineering/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/UNIZAR-30246-WebEngineering/subscriptions","organizations_url":"https://api.github.com/users/UNIZAR-30246-WebEngineering/orgs","repos_url":"https://api.github.com/users/UNIZAR-30246-WebEngineering/repos","events_url":"https://api.github.com/users/UNIZAR-30246-WebEngineering/events{/privacy}","received_events_url":"https://api.github.com/users/UNIZAR-30246-WebEngineering/received_events","type":"Organization","site_admin":false},"repo":{"id":68467633,"name":"lab1-git-race","full_name":"UNIZAR-30246-WebEngineering/lab1-git-race","owner":{"login":"UNIZAR-30246-WebEngineering","id":8750189,"avatar_url":"https://avatars.githubusercontent.com/u/8750189?v=3","gravatar_id":"","url":"https://api.github.com/users/UNIZAR-30246-WebEngineering","html_url":"https://github.com/UNIZAR-30246-WebEngineering","followers_url":"https://api.github.com/users/UNIZAR-30246-WebEngineering/followers","following_url":"https://api.github.com/users/UNIZAR-30246-WebEngineering/following{/other_user}","gists_url":"https://api.github.com/users/UNIZAR-30246-WebEngineering/gists{/gist_id}","starred_url":"https://api.github.com/users/UNIZAR-30246-WebEngineering/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/UNIZAR-30246-WebEngineering/subscriptions","organizations_url":"https://api.github.com/users/UNIZAR-30246-WebEngineering/orgs","repos_url":"https://api.github.com/users/UNIZAR-30246-WebEngineering/repos","events_url":"https://api.github.com/users/UNIZAR-30246-WebEngineering/events{/privacy}","received_events_url":"https://api.github.com/users/UNIZAR-30246-WebEngineering/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/UNIZAR-30246-WebEngineering/lab1-git-race","description":"Laboratory 1 - Git Race (deadline 07/Oct)","fork":false,"url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race","forks_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/forks","keys_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/keys{/key_id}","collaborators_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/teams","hooks_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/hooks","issue_events_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/issues/events{/number}","events_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/events","assignees_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/assignees{/user}","branches_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/branches{/branch}","tags_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/tags","blobs_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/git/refs{/sha}","trees_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/git/trees{/sha}","statuses_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/statuses/{sha}","languages_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/languages","stargazers_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/stargazers","contributors_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/contributors","subscribers_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/subscribers","subscription_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/subscription","commits_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/commits{/sha}","git_commits_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/git/commits{/sha}","comments_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/comments{/number}","issue_comment_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/issues/comments{/number}","contents_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/contents/{+path}","compare_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/compare/{base}...{head}","merges_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/merges","archive_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/downloads","issues_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/issues{/number}","pulls_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/pulls{/number}","milestones_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/milestones{/number}","notifications_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/labels{/name}","releases_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/releases{/id}","deployments_url":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/deployments","created_at":"2016-09-17T17:36:10Z","updated_at":"2016-09-22T10:25:32Z","pushed_at":"2016-10-02T12:40:51Z","git_url":"git://github.com/UNIZAR-30246-WebEngineering/lab1-git-race.git","ssh_url":"git@github.com:UNIZAR-30246-WebEngineering/lab1-git-race.git","clone_url":"https://github.com/UNIZAR-30246-WebEngineering/lab1-git-race.git","svn_url":"https://github.com/UNIZAR-30246-WebEngineering/lab1-git-race","homepage":"","size":218,"stargazers_count":0,"watchers_count":0,"language":"Java","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":23,"mirror_url":null,"open_issues_count":11,"forks":23,"open_issues":11,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/pulls/53"},"html":{"href":"https://github.com/UNIZAR-30246-WebEngineering/lab1-git-race/pull/53"},"issue":{"href":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/issues/53"},"comments":{"href":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/issues/53/comments"},"review_comments":{"href":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/pulls/53/comments"},"review_comment":{"href":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/pulls/53/commits"},"statuses":{"href":"https://api.github.com/repos/UNIZAR-30246-WebEngineering/lab1-git-race/statuses/5e7fbe99f4daa3813fec8a0058b297650471d8d0"}}}}
{"actor":{"display_login":"fjlopez"}}