{"id":25965256,"url":"https://github.com/maximeculea/meetup-git","last_synced_at":"2026-04-19T06:42:56.560Z","repository":{"id":40856507,"uuid":"162194767","full_name":"MaximeCulea/meetup-git","owner":"MaximeCulea","description":"Meetup sur GIT","archived":false,"fork":false,"pushed_at":"2022-12-10T18:24:39.000Z","size":23255,"stargazers_count":0,"open_issues_count":12,"forks_count":0,"subscribers_count":3,"default_branch":"master","last_synced_at":"2023-03-02T11:55:48.658Z","etag":null,"topics":["git","learning","learning-git","meetup","wordpress"],"latest_commit_sha":null,"homepage":"https://maximeculea.fr","language":"PHP","has_issues":true,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":"other","status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/MaximeCulea.png","metadata":{"files":{"readme":"readme.md","changelog":null,"contributing":null,"funding":null,"license":"license.txt","code_of_conduct":null,"threat_model":null,"audit":null,"citation":null,"codeowners":null,"security":null,"support":null}},"created_at":"2018-12-17T21:58:10.000Z","updated_at":"2020-02-27T19:13:30.000Z","dependencies_parsed_at":"2023-01-26T08:00:49.673Z","dependency_job_id":null,"html_url":"https://github.com/MaximeCulea/meetup-git","commit_stats":null,"previous_names":[],"tags_count":null,"template":null,"template_full_name":null,"repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/MaximeCulea%2Fmeetup-git","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/MaximeCulea%2Fmeetup-git/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/MaximeCulea%2Fmeetup-git/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/MaximeCulea%2Fmeetup-git/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/MaximeCulea","download_url":"https://codeload.github.com/MaximeCulea/meetup-git/tar.gz/refs/heads/master","host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":241928507,"owners_count":20043820,"icon_url":"https://github.com/github.png","version":null,"created_at":"2022-05-30T11:31:42.601Z","updated_at":"2022-07-04T15:15:14.044Z","host_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub","repositories_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories","repository_names_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repository_names","owners_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners"}},"keywords":["git","learning","learning-git","meetup","wordpress"],"created_at":"2025-03-04T21:38:55.296Z","updated_at":"2026-04-19T06:42:51.503Z","avatar_url":"https://github.com/MaximeCulea.png","language":"PHP","funding_links":[],"categories":[],"sub_categories":[],"readme":"# Introduction au gestionnaire de version GIT\n\n## WP Meetup Geneva\n\n- Slides : https://slides.com/maximeculea/meetup-wp-geneve-introduction-git\n- YouTube vidéo : coming soon\n\n## WP Meetup Paris\n\n- Slides : https://slides.com/maximeculea/meetup-wordpress-git\n- YouTube vidéo : https://www.youtube.com/watch?v=-VFoqwbQSM8\n\n## General git workflow\n1. add a file from IDE : `maxime.php`\n2. add it to git : \u003ccode\u003egit add maxime.php\u003c/code\u003e or all files with \u003ccode\u003egit add .\u003c/code\u003e\n3. edit the file then commit changes : \u003ccode\u003egit commit -m \"my first commit\"\u003c/code\u003e\n4. push them : \u003ccode\u003egit push origin master\u003c/code\u003e\n\n## Git Conflict\n1. create a new branch from master : \u003ccode\u003egit checkout -b evol/1\u003c/code\u003e\n2. edit the file :\n```\n\u003c!DOCTYPE html\u003e\n\u003chtml\u003e\n\u003cbody class=\"toto\"\u003e\n\n\u003ch1\u003eMy First Heading\u003c/h1\u003e\n\u003cp\u003eMy first paragraph.\u003c/p\u003e\n\n\u003c/body\u003e\n\u003c/html\u003e\n```\n3. push the changes : \u003ccode\u003egit push origin evol/1\u003c/code\u003e\n4. create from master a other one : \u003ccode\u003egit checkout -b evol/2\u003c/code\u003e\n5. edit the file :\n```\n\u003c!DOCTYPE html\u003e\n\u003chtml\u003e\n\u003cbody class=\"toto titi\"\u003e\n\n\u003ch1\u003e\u003c?php the_title(); ?\u003e\u003c/h1\u003e\n\u003cp\u003eMy first paragraph.\u003c/p\u003e\n\n\u003c/body\u003e\n\u003c/html\u003e\n```\n6. push changes : \u003ccode\u003egit push origin evol/2\u003c/code\u003e\n7. we can change branches (content) as we want : \u003ccode\u003egit checkout evol/1\u003c/code\u003e\n8. on server, only get the modifications : \u003ccode\u003egit fetch -a\u003c/code\u003e\n9. to apply the new modifications : \u003ccode\u003egit pull -f\u003c/code\u003e\n10. finally merge the two branches on master :\n    - go on master : \u003ccode\u003egit checkout master\u003c/code\u003e\n    - merge branches : \u003ccode\u003egit merge evol/1\u003c/code\u003e and \u003ccode\u003egit merge evol/2\u003c/code\u003e\n11. it results into a conflict :\n    - edit the final modification into the file\n    - stage changes : \u003ccode\u003egit add .\u003c/code\u003e\n    - then commit them : \u003ccode\u003egit commit -m \"Resolved merge conflict by incorporating both suggestions.\"\u003c/code\u003e\n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fmaximeculea%2Fmeetup-git","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Fmaximeculea%2Fmeetup-git","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fmaximeculea%2Fmeetup-git/lists"}