merge-conflicts

There are 1 repository under merge-conflicts topic.

• mhagger / git-imerge

  Incremental merge for git

  gitmerge-conflictspython
  Language:Python 2774

• truebit / xUnique

  merge Xcode project file is so easy

  merge-conflictspythonxcodexcode-project-file
  Language:Python 1505

• AndrewRadev / linediff.vim

  A vim plugin to perform diffs on blocks of code

  vimdiffrefactoringmerge-conflicts
  Language:Vim Script 484

• smashwilson / merge-conflicts

  Resolve git merge conflicts in Atom

  merge-conflictsatomconflict-resolution
  Language:CoffeeScript 431

• samoshkin / vim-mergetool

  :cake: Efficient way of using Vim as a Git mergetool

  vimvim-plugingitmergetoolmerge-conflictsvimdiffdiff
  Language:Vim Script 298
• resolve-merge-conflicts

  skills / resolve-merge-conflicts

  Learn why conflicts happen and how to resolve them.

  gitgithubmerge-conflictmerge-conflictsskills-course
  194

• balbuf / composer-git-merge-driver

  Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files

  composercomposer-jsoncomposer-lockgitgit-mergegit-mergermergemerge-conflictmerge-conflicts
  Language:PHP 133

• jakub-g / git-resolve-conflict

  :heavy_dollar_sign: :heavy_plus_sign: :heavy_minus_sign: :white_check_mark: Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)

  gitmerge-conflictsconflict-resolutiongit-mergetoolsresolve-conflictsconflicting-changes
  Language:Shell 52

• pprice / vscode-better-merge

  Better merge conflict support for vscode

  vscodeconflict-blocksextensionmerge-conflicts
  Language:TypeScript 47

• magit / magit-imerge

  Magit extension for git-imerge
  Language:Emacs Lisp 31

• olivernybroe / action-conflict-finder

  A Github action for finding merge conflicts

  merge-conflictsgithub-actiongithub-actionsgithub-workflowhacktoberfest
  Language:Shell 30

• liaojinxing / ConflictResolver

  An Xcode Source Editor Extension that helps resolving merge conflicts. There are three options, namely 'Accept theirs', 'Accept Yours', and 'Keep Both'. Only one click and it will make the change for you automatically.

  xcodexcode-source-editor-extensionmerge-conflictsconflict-resolution
  Language:Swift 25

• tonyg / revctrl.org

  An extract, as complete as I can make it, of content from the revctrl.org wiki

  revision-controlversion-controlmerge-conflictsmerging-algorithmsmerging-conflictsource-control
  Language:Python 22

• codershiyar / git

  Git and GitHub Crash Course 2023 - اقوى دورة تعلم جيت و جيت هاب

  gitgit-commandsgit-coursegit-tutorialgit-tutorialsgithubgithub-tutoriallearn-gitlearn-githubmerge-conflicts
  17

• errael / splice9

  A Vim9.1 plugin for managing three-way merges; pure vim9script.

  diffdiff-toolgui-diffmergemerge-conflictsmerge-toolmerginggui-merge
  Language:Vim Script 14

• thufv / automerge

  Resolve conflicts via version space algebra in structured merge.

  merge-conflictsmergerstructured-mergejavaconflict-resolutionversion-space-algebraprogram-synthesis
  Language:Java 7

• ualberta-smr / merganser

  Merganser is a scalable and extendable tool for analyzing merge scenarios in git repositories

  software-engineeringsoftware-developmentsoftware-mergingsoftware-researchmerge-conflictsdatasetpythonmysql
  Language:Python 7

• blueworld-gmbh / postbox

  📬A tool to split up a Postman collection into files. One file per request.

  postmanpostman-collectionsplittermerge-conflicts
  Language:TypeScript 6

• formidablae / merge-conflicts

  merge-conflictsgithubtraininglab
  Language:HTML 6

• CodyTseng / auto-comment-merge-conflicts

  Github Action to automatically add a comment (and a label) to alert developers when there are merge conflicts

  github-actionsauto-commentauto-labelmerge-conflicts
  Language:TypeScript 4

• sophilabs / gilp-merge-conflict

  Gilp plugin to detect merge conflicts.

  gilp-pluginmerge-conflicts
  Language:JavaScript 4

• console-helpers / svn-buddy

  Simplified Subversion command-line workflow

  clisubversionmergemerge-conflictssvn
  Language:PHP 3

• ishansaksena / Conflerge

  Resolving conflict merges with ASTs

  gitmerge-conflictsabstract-syntax-treetokenizationmergetool
  Language:Java 3

• vishaln15 / Version-control-with-git

  This repository contains materials for the final peer-review project/assignment. Course Instructor Steve Byrnes

  gitversion-controlgit-pullpull-requestrebasinggit-commitforksmerge-conflictstagsreferencesgit-idsgit-addfast-forwardbranchinggit-workflow
  3

• zegervdv / settle.nvim

  Settle your merge conflicts from Neovim

  merge-conflictsneovimneovim-lua-pluginneovim-plugin
  Language:Lua 3

• danglotb / conflict-merge-solver

  conflict-resolutionmerge-conflicts
  Language:Java 2

• pg8wood / changelog-generator

  Curbing Cumbersome Changelog Conflicts.

  changelogchangelog-generatorkeepachangelogsemantic-versioningchangeloggergitmerge-conflictsmarkdownversioningrelease
  Language:Swift 2

• denoerss / git-advanced

  This repository is part of my Web Development Bootcamp @ Neue Fische 🐡 – it is focused on advanced Git concepts and includes a session where merge conflicts are intentionally triggered, giving the opportunity to practice resolving complex conflicts and deepen the understanding of Git workflows.

  gitgit-conflictmerge-conflicts
  Language:JavaScript 1

• marckassay / DemoOfGitConflicts

  Replicates by automation the following three Git conflicts: 'content', 'add/add' and 'modify/delete'.

  gitpowershelldemonstrationmerge-conflicts
  Language:PowerShell 1

• SolangeUG / merge-conflict

  githubmerge-conflictspull-requests
  Language:HTML 1

• Chaos-Camp / code-drift-challenge-python

  Code Challenge: dealing with projects that suffer from code drift

  best-practicesbranchingchallengecode-driftcoding-challengedevopsdocumentationflaskgit-branchesgit-challengegit-practicegit-tutorialmerge-conflictsmerge-strategyreconciliationrepository-managementsoftware-engineeringversion-controlweb-developmentreal-world-scenario
  Language:Python 0

• MuhammadZulhusni / Git-Testing

  This repo is meant to further strengthen my knowledge of git and help me track changes, try new ideas in branches and collaborate easily.

  branchcommitforkgitlearning-repositorymergemerge-conflictsremote
  0

• emmanseete / skills.resolve-merge-conflicts

  Learn why conflicts happen and how to resolve them.

  gitgithubmerge-conflictmerge-conflictsskills-course

• 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.

  branchinggitgithublocalmerge-conflictsmergingsshundoing
  Language:HTML

• purwar1997 / git-collaboration

  Learning Git features that are used for collaboration

  branchingcollaborationmerge-conflictsmerging
  Language:HTML

• ZairBulos / skills-resolve-merge-conflicts

  @skills "Resolve merge conflicts"

  githubgithub-skillsmerge-conflicts