{"id":15476949,"url":"https://github.com/mahammad-mostafa/git-flow-conflict-exercise","last_synced_at":"2026-01-04T02:05:29.470Z","repository":{"id":183572209,"uuid":"670386858","full_name":"mahammad-mostafa/git-flow-conflict-exercise","owner":"mahammad-mostafa","description":"This is the sixth project in the second module in the Microverse program. It is an exercise for practicing Git merge conflicts with GitFlow workflow.","archived":false,"fork":false,"pushed_at":"2023-07-25T02:27:00.000Z","size":10,"stargazers_count":0,"open_issues_count":0,"forks_count":0,"subscribers_count":1,"default_branch":"development","last_synced_at":"2024-10-19T03:02:25.393Z","etag":null,"topics":["gitflow","gitflow-workflow","merge-conflicts"],"latest_commit_sha":null,"homepage":"","language":null,"has_issues":true,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":"mit","status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/mahammad-mostafa.png","metadata":{"files":{"readme":"README.md","changelog":null,"contributing":null,"funding":null,"license":"LICENSE.md","code_of_conduct":null,"threat_model":null,"audit":null,"citation":null,"codeowners":null,"security":null,"support":null,"governance":null,"roadmap":null,"authors":null,"dei":null,"publiccode":null,"codemeta":null}},"created_at":"2023-07-25T00:17:57.000Z","updated_at":"2023-07-25T02:18:02.000Z","dependencies_parsed_at":"2024-11-23T22:46:49.060Z","dependency_job_id":null,"html_url":"https://github.com/mahammad-mostafa/git-flow-conflict-exercise","commit_stats":{"total_commits":10,"total_committers":1,"mean_commits":10.0,"dds":0.0,"last_synced_commit":"a6c0504ef2ca2f5a51c42198abc6cbfeb6452e79"},"previous_names":["mahammad-mostafa/git-flow-exercise"],"tags_count":0,"template":false,"template_full_name":null,"purl":"pkg:github/mahammad-mostafa/git-flow-conflict-exercise","repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/mahammad-mostafa%2Fgit-flow-conflict-exercise","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/mahammad-mostafa%2Fgit-flow-conflict-exercise/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/mahammad-mostafa%2Fgit-flow-conflict-exercise/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/mahammad-mostafa%2Fgit-flow-conflict-exercise/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/mahammad-mostafa","download_url":"https://codeload.github.com/mahammad-mostafa/git-flow-conflict-exercise/tar.gz/refs/heads/development","sbom_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/mahammad-mostafa%2Fgit-flow-conflict-exercise/sbom","scorecard":null,"host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":286080680,"owners_count":28196433,"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","status":"online","status_checked_at":"2026-01-04T02:00:06.065Z","response_time":58,"last_error":null,"robots_txt_status":"success","robots_txt_updated_at":"2025-07-24T06:49:26.215Z","robots_txt_url":"https://github.com/robots.txt","online":true,"can_crawl_api":true,"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":["gitflow","gitflow-workflow","merge-conflicts"],"created_at":"2024-10-02T03:41:43.274Z","updated_at":"2026-01-04T02:05:29.443Z","avatar_url":"https://github.com/mahammad-mostafa.png","language":null,"funding_links":[],"categories":[],"sub_categories":[],"readme":"\u003ca name=\"title\"\u003e\u003c/a\u003e\n\n\u003c!-- TITLE --\u003e\n\n# 🏷️ Git Flow Conflict Exercise\n\nThis is an exercise for practicing `Git merge conflicts` using `GitFlow` workflow in the second module in the **Microverse** program.\n\u003cbr/\u003e\nCheck the below contents for further details about this project.\n\n\u003c!-- CONTENTS --\u003e\n\n# 📗 Contents\n\n- [Description](#description)\n- [Instructions](#instructions)\n- [Authors](#authors)\n- [Contributions](#contributions)\n- [Support](#support)\n- [Acknowledgements](#acknowledgements)\n- [License](#license)\n\n\u003c!-- DESCRIPTION --\u003e\n\n\u003ca name=\"description\"\u003e\u003c/a\u003e\n\n# 📖 Description\n\nThis project is a basic plain test files used to create merge conflicts.\nIt is intended for practicing resolving merge conflicts using `GitFlow` workflow.\nThree text files are used (`programmer.txt` / `simplicity.txt` / `solve.txt`).\n\n📌 **Key Features:**\n- Very simple text files with quotes\n- Two conflicting branches created\n- Merge conflict resolved on `add-quotes` branch\n \n\u003cp align=\"right\"\u003e\u003ca href=\"#title\"\u003eback to top\u003c/a\u003e\u003c/p\u003e\n\n\u003c!-- INSTRUCTIONS --\u003e\n\n\u003ca name=\"instructions\"\u003e\u003c/a\u003e\n\n# 🛠️ Instructions\n\n- You can easily download or fork this repository and work on it immadiately!\n- No requirements or prerequisites are needed\n\n\u003cp align=\"right\"\u003e\u003ca href=\"#title\"\u003eback to top\u003c/a\u003e\u003c/p\u003e\n\n\u003c!-- AUTHORS --\u003e\n\n\u003ca name=\"authors\"\u003e\u003c/a\u003e\n\n# 👥 Authors\n\n📌 **Mahammad:**\n- [GitHub](https://github.com/mahammad-mostafa)\n- [Twitter](https://twitter.com/mahammad_mostfa)\n- [LinkedIn](https://linkedin.com/in/mahammad-mostafa)\n\n\u003cp align=\"right\"\u003e\u003ca href=\"#title\"\u003eback to top\u003c/a\u003e\u003c/p\u003e\n\n\u003c!-- CONTRIBUTIONS --\u003e\n\n\u003ca name=\"contributions\"\u003e\u003c/a\u003e\n\n# 🤝🏻 Contributions\n\nWish to contribute to this project?\n\u003cbr/\u003e\nContributions, issues, and feature requests are more than welcome!\n\u003cbr/\u003e\nFeel free to check the [issues](../../issues) page too.\n\n\u003cp align=\"right\"\u003e\u003ca href=\"#title\"\u003eback to top\u003c/a\u003e\u003c/p\u003e\n\n\u003c!-- SUPPORT --\u003e\n\n\u003ca name=\"support\"\u003e\u003c/a\u003e\n\n# ⭐️ Support\n\nLike this project? Show your support by starring!\n\n\u003cp align=\"right\"\u003e\u003ca href=\"#title\"\u003eback to top\u003c/a\u003e\u003c/p\u003e\n\n\u003c!-- ACKNOWLEDGEMENTS --\u003e\n\n\u003ca name=\"acknowledgements\"\u003e\u003c/a\u003e\n\n# 🙏🏻 Acknowledgements\n\nI thank everyone at **Microverse** for guiding me through this project.\n\n\u003cp align=\"right\"\u003e\u003ca href=\"#title\"\u003eback to top\u003c/a\u003e\u003c/p\u003e\n\n\u003c!-- LICENSE --\u003e\n\n\u003ca name=\"license\"\u003e\u003c/a\u003e\n\n# 📝 License\n\nThis project is [MIT](LICENSE.md) licensed.\n\n\u003cp align=\"right\"\u003e\u003ca href=\"#title\"\u003eback to top\u003c/a\u003e\u003c/p\u003e\n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fmahammad-mostafa%2Fgit-flow-conflict-exercise","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Fmahammad-mostafa%2Fgit-flow-conflict-exercise","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fmahammad-mostafa%2Fgit-flow-conflict-exercise/lists"}