github-starred/awesome-learning
2
0
Fork 0
mirror of https://github.com/Lets-DevOps/awesome-learning.git synced 2026-10-17 13:15:55 -05:00
Code Issues 13 Packages Projects Releases 1 Wiki Activity

Swap Git Workflows link for merge-conflicts guide (avoid redundancy)

Browse Source 
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.
This commit is contained in:
Amaresh Pelleti
2026-09-17 07:58:50 -04:00
committed by GitHub
parent d7cebc6057
commit 460b720651
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -2
View File
@@ -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) - [ ] [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) - [ ] [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) - [ ] [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: ## Build Automation:
## Continuous Integration: ## Continuous Integration: