From d7cebc6057e1a2988b0bcfe8d66fc4b0a0970e0b Mon Sep 17 00:00:00 2001 From: Amaresh Pelleti Date: Mon, 14 Sep 2026 12:25:09 -0400 Subject: [PATCH 1/2] Add Git branching-model comparison to learning resources Added a comparison of Git workflows by team size and release cadence. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7176e9a..a733c2f 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,7 @@ - [ ] [How is SVN v 1.8 branching / merging compared to Git?](http://stackoverflow.com/questions/19333088/how-is-svn-v-1-8-branching-merging-compared-to-git) - [ ] [Code Reviews - Git Pull Requests Vs Gerrit](https://julien.danjou.info/blog/2013/rant-about-github-pull-request-workflow-implementation) - [ ] [Zappr - Approvals for Github PRs - By Zalando](https://zappr.opensource.zalan.do/login) +- [ ] [Git Workflows: GitFlow vs GitHub Flow vs Trunk-Based Development](https://devtoolhub.com/git-workflows-gitflow-githubflow-trunk-based/) - Comparison of branching models by team size and release cadence. ## Build Automation: From 460b720651f28029807b24d362b50e31d336589d Mon Sep 17 00:00:00 2001 From: Amaresh Pelleti Date: Thu, 17 Sep 2026 07:58:50 -0400 Subject: [PATCH 2/2] Swap Git Workflows link for merge-conflicts guide (avoid redundancy) A commenter pointed out the Git-workflows comparison link overlapped with the Atlassian comparing-workflows link already in this section. Swapped it for a merge-conflicts resolution guide instead, which the file has no existing coverage of. --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index a733c2f..0822aae 100644 --- a/README.md +++ b/README.md @@ -59,8 +59,7 @@ - [ ] [How is SVN v 1.8 branching / merging compared to Git?](http://stackoverflow.com/questions/19333088/how-is-svn-v-1-8-branching-merging-compared-to-git) - [ ] [Code Reviews - Git Pull Requests Vs Gerrit](https://julien.danjou.info/blog/2013/rant-about-github-pull-request-workflow-implementation) - [ ] [Zappr - Approvals for Github PRs - By Zalando](https://zappr.opensource.zalan.do/login) -- [ ] [Git Workflows: GitFlow vs GitHub Flow vs Trunk-Based Development](https://devtoolhub.com/git-workflows-gitflow-githubflow-trunk-based/) - Comparison of branching models by team size and release cadence. - +- [ ] [How to Handle Merge Conflicts in Git](https://devtoolhub.com/how-to-handle-merge-conflicts-in-git/) - Resolving conflicts at the command line, step by step, including the tricky rebase/cherry-pick cases. ## Build Automation: ## Continuous Integration: