#

merge-conflicts

Here are 7 public repositories matching this topic...

formidablae / merge-conflicts

merge-conflicts lab githubtraining

Updated Nov 19, 2021
HTML

SolangeUG / merge-conflict

github merge-conflicts pull-requests

Updated Oct 28, 2024
HTML

purwar1997 / git-collaboration

Learning Git features that are used for collaboration

merge-conflicts branching collaboration merging

Updated Feb 16, 2025
HTML

ILyass-Lr / demo_repo

● Objectif: Get familiarised with GitHub and Git. ● The learning ressource: The YT video titled: Git and GitHub for Beginners - Crash Course by freeCodeCamp. ⚠ Note this repo is created on GitHub and then connected to Our local machine via an SSH-Key. checkout the demo_repo_local for steps to create a local repo and push its changes to GitHub.

github git merge-conflicts ssh local branching merging undoing

Updated Jan 26, 2025
HTML

McCambley / test-repo

This repository is meant to demonstrate how merge conflicts may arise on group projects and how we can go about fixing them

github git merge-conflicts

Updated Jun 6, 2021
HTML

fnogcps / merge-conflicts

Merge conflicts are a normal part of working in Git. Learn why they happen and how to resolve them with ease.

git merge-conflicts

Updated Jan 14, 2022
HTML

EPICLab / EMSE19-MergeConflicts

EMSE journal paper "The Life-Cycle of Merge Conflicts: Processes, Barriers, and Strategies" (Accepted)

merge-conflicts processes theory quantitative research-paper

Updated Nov 2, 2018
HTML

Improve this page

Add a description, image, and links to the merge-conflicts topic page so that developers can more easily learn about it.

Curate this topic

Add this topic to your repo

To associate your repository with the merge-conflicts topic, visit your repo's landing page and select "manage topics."