{"action":"created","issue":{"url":"https://api.github.com/repos/Gp2mv3/Syntheses/issues/598","repository_url":"https://api.github.com/repos/Gp2mv3/Syntheses","labels_url":"https://api.github.com/repos/Gp2mv3/Syntheses/issues/598/labels{/name}","comments_url":"https://api.github.com/repos/Gp2mv3/Syntheses/issues/598/comments","events_url":"https://api.github.com/repos/Gp2mv3/Syntheses/issues/598/events","html_url":"https://github.com/Gp2mv3/Syntheses/pull/598","id":354055304,"node_id":"MDExOlB1bGxSZXF1ZXN0MjEwOTI4Mzk3","number":598,"title":"Work on fem summary, small fixes to fem test","user":{"login":"Peiffap","id":25282854,"node_id":"MDQ6VXNlcjI1MjgyODU0","avatar_url":"https://avatars1.githubusercontent.com/u/25282854?v=4","gravatar_id":"","url":"https://api.github.com/users/Peiffap","html_url":"https://github.com/Peiffap","followers_url":"https://api.github.com/users/Peiffap/followers","following_url":"https://api.github.com/users/Peiffap/following{/other_user}","gists_url":"https://api.github.com/users/Peiffap/gists{/gist_id}","starred_url":"https://api.github.com/users/Peiffap/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Peiffap/subscriptions","organizations_url":"https://api.github.com/users/Peiffap/orgs","repos_url":"https://api.github.com/users/Peiffap/repos","events_url":"https://api.github.com/users/Peiffap/events{/privacy}","received_events_url":"https://api.github.com/users/Peiffap/received_events","type":"User","site_admin":false},"labels":[{"id":1028299476,"node_id":"MDU6TGFiZWwxMDI4Mjk5NDc2","url":"https://api.github.com/repos/Gp2mv3/Syntheses/labels/Ajout","name":"Ajout","color":"cc7ae8","default":false},{"id":47430440,"node_id":"MDU6TGFiZWw0NzQzMDQ0MA==","url":"https://api.github.com/repos/Gp2mv3/Syntheses/labels/Am%C3%A9lioration","name":"Amélioration","color":"207de5","default":false}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":2,"created_at":"2018-08-26T01:04:14Z","updated_at":"2018-08-26T19:28:20Z","closed_at":null,"author_association":"COLLABORATOR","pull_request":{"url":"https://api.github.com/repos/Gp2mv3/Syntheses/pulls/598","html_url":"https://github.com/Gp2mv3/Syntheses/pull/598","diff_url":"https://github.com/Gp2mv3/Syntheses/pull/598.diff","patch_url":"https://github.com/Gp2mv3/Syntheses/pull/598.patch"},"body":"Maybe WIP, mais probablement pas."},"comment":{"url":"https://api.github.com/repos/Gp2mv3/Syntheses/issues/comments/416063560","html_url":"https://github.com/Gp2mv3/Syntheses/pull/598#issuecomment-416063560","issue_url":"https://api.github.com/repos/Gp2mv3/Syntheses/issues/598","id":416063560,"node_id":"MDEyOklzc3VlQ29tbWVudDQxNjA2MzU2MA==","user":{"login":"MartinBraquet","id":25173236,"node_id":"MDQ6VXNlcjI1MTczMjM2","avatar_url":"https://avatars2.githubusercontent.com/u/25173236?v=4","gravatar_id":"","url":"https://api.github.com/users/MartinBraquet","html_url":"https://github.com/MartinBraquet","followers_url":"https://api.github.com/users/MartinBraquet/followers","following_url":"https://api.github.com/users/MartinBraquet/following{/other_user}","gists_url":"https://api.github.com/users/MartinBraquet/gists{/gist_id}","starred_url":"https://api.github.com/users/MartinBraquet/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MartinBraquet/subscriptions","organizations_url":"https://api.github.com/users/MartinBraquet/orgs","repos_url":"https://api.github.com/users/MartinBraquet/repos","events_url":"https://api.github.com/users/MartinBraquet/events{/privacy}","received_events_url":"https://api.github.com/users/MartinBraquet/received_events","type":"User","site_admin":false},"created_at":"2018-08-26T19:28:20Z","updated_at":"2018-08-26T19:28:20Z","author_association":"COLLABORATOR","body":"Ok, j'ai pullé ta branche et j'ai testé moi-même, voilà ce que j'ai fait qui a l'air de fonctionner comme il faut:\r\n'git checkout fem`\r\n`git reset --hard HEAD~` pour enlever le merge commit\r\n`git rebase master`, c'est cette commande qui a un conflit (l'erreur de merge dont tu parles) car la branche upstream/master et ta branche fem ont toutes deux modifié `src/q4/fem-MECA1120/test/2014/Avril/All/fem-MECA1120-test-2014-Avril-All.tex` . Donc tu ouvres ce fichier et tu remets le bon hypertitle (avec l'option {majeure} qui n'était pas dans le doc de ta branche ).\r\nEnsuite, `git add src/q4/fem-MECA1120/test/2014/Avril/All/fem-MECA1120-test-2014-Avril-All.tex` et `git rebase --continue` .\r\nVérifie quand même que tout est en ordre avec `git log`, tu devrais voir tes 4 commits devant la branche upstream/master et ton master (si ton master local et remote sont à jour avec upstream bien sûr), comme ceci :wink:\r\n![image](https://user-images.githubusercontent.com/25173236/44632204-f2d3c500-a976-11e8-967e-27b94cbbf634.png)\r\n\r\n\r\n"}}
{"actor":{"display_login":"MartinBraquet"}}