git-merge

There are 1 repository under git-merge topic.

balbuf / composer-git-merge-driver
Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files
composer git composer-json git-merge git-merger composer-lock merge merge-conflict merge-conflicts
Language:PHP 133
joechea-aupp / github_tut
Github 1️⃣0️⃣1️⃣
git-branching git-clone git-fork git-merge
Language:Python 51
zawys / vscode-as-git-mergetool
VS Code extension providing diff editor layouts & more for 3-way merging
3-way-merge diff-layout git git-merge vscode-extension
Language:TypeScript 43
jelmer / awesome-merge-drivers
List of great merge drivers for git and other version control tools
git-merge merge-driver custom-merge git-merge-drivers merge-drivers
32
exions / merge-upstream
⤵️ Merge in changes from upstream. Useful for syncing upstream changes to fork.
git git-merge github-actions githubactions
23
hyperia-sk / remote-branch-housekeeping
Simple and efficient way to delete remote branches from git repository.
git git-branch housekeeping remote branch cleaner git-mergetools git-branching git-merge
Language:Shell 15
yanamura / git-flow-merge-action
github-actions gitflow git-flow git-merge
Language:TypeScript 15
bzdgn / git-tutorial
Git tutorial with command line
git github git-tutorial merge merge-conflict revert git-revert git-merge rebase git-rebase squash git-squash
8
WSMathias / Git-Cheat-Sheet
Practical Git Cheat Sheet, Encompassing Key Use Cases and Command Structures
branch commit git-config merge checkout pull push reset cherry-pick revert git-rebase git-stash git-merge git-push git-reset git-log git-branch git-branching git-cheatsheet
8
jamescherti / batchfetch
Batchfetch: Efficiently clone or pull multiple Git repositories in parallel
git git-clone git-fetch git-merge git-pull
Language:Python 3
Siphalor / giup
Python script for automated, iterative git merges and publishing
pypi workflow git git-merge
Language:Python 3
thekoushik / safe-merge-files
Merge two files like git
merge-files javascript nodejs git-merge
Language:JavaScript 3
AntonV0 / recipe-book
Project #60 of Codecademy's Full Stack Engineer Career Path
git-clone git-fetch git-merge git-push github-collaboration
2
Ch-sriram / Just-Git-In
Implementation of beginner to advanced concepts of git and GitHub.
git github git-log git-reflog git-reset git-stash git-merge git-alias git-mergetool git-branch git-remote git-commit git-tag
2
developer-shourav / Git-Branching-Marging
Here is some usefull Git branching And merging command that you need to know for working in a team project.
git git-branching git-merge project-management team-work
2
JulianaTagami / hiringcoders3-introduction-git-github
Hiring Coders 3-Introduction Git/GitHub
git git-actions git-branch git-fork git-merge git-pull-request github github-pages
Language:JavaScript 2
MrFlynn / git-absorb
:wrench: An extension for Git that combines multiple repositories into a single repository.
git github shell-script git-merge
Language:Shell 2
PGSch / graph-git-repo
Automatically generate visual graph of repository's structure using Markdown and Mermaid diagrams
action git-merge mermaid repo openai-api
Language:Python 2
TomHerman11 / npm-install-or-yarn-after-git-merge-checkout-rebase
An example of a Node.js project that utilizes the npm package Husky and git hooks for automatic execution of npm install (or yarn) after git merge, git checkout or git rebase, if needed ⛑️🛠️
git-checkout git-merge git-rebase githooks husky npm-install yarn
Language:Shell 2
wavim / vscode-git-branch
Level up Inspector for Git Branches
git-branches git-merge vscode-extension
Language:TypeScript 2
web-full-stack / git
git squash vs git merge vs git rebase
git git-commit git-hooks git-merge git-rebase git-revert git-squash github
Language:Shell 2
abraham-ukachi / git-begins
A repository created as part of a school assignment on Git & Github that contains ~4 jobs.
git git-branch git-clone git-fetch git-log git-merge git-pull git-push git-status github git-checkout git-mergetool vimdiff
1
amirkangarloo / git-merge-vs-git-rebase
Git Merge VS Git Rebase with one is better
git git-merge git-rebase
1
Anshul-Sonpure / Basic-Git-Commands
Basic Git Commands and Workflow
git git-cheatsheet git-cheatsheets git-commands git-diff git-merge github version-control
1
AntonV0 / javascript-homework
Project #59 of Codecademy's Full Stack Engineer Career Path
git-clone git-commands git-fetch git-merge git-push git-remote github-teams
Language:JavaScript 1
Chetandhangar / LearningGit
This repo is create to learn git features like:- branching , PR, MergePR and many more.
git github branching git-merge git-pull-request git-branch
Language:HTML 1
DanHouseman / AllYourRebase
Auto Git Feature Branch Integration Rebase
branching-strategies git git-merge git-rebase
Language:Shell 1
jdevfullstack-tutorials / git-merge-resolve
the never ending headache of git merge conflicts, so here we are to solve it !
git git-conflicts git-merge git-tools git-workflow git-mastery
1
Mahbub-Ferdous / Git_and_github-Study
git github git-status git-init git-add git-commit-messages git-push git-merge git-branch git-repo
Language:Python 1
MakeSchool-Tutorials / Git-to-Know-Branching
🌳 Branches aren't just for trees! Learn how to create and manage branches effectively with this handy, step by step tutorial!
git git-workflow git-feature-branch git-branch git-merge collaboration
1
mistweaverco / diffconflicts.nvim
Make resolving merge conflicts in Neovim a breeze.
git git-merge git-mergetool git-mergetools neovim neovim-plugin
Language:Lua 1
thinkverse / merge-via-cli
Testing merging via CLI
github-cli git-merge how-to
Language:HTML 1
vi / for_merge
A test repository to demonstrate git merging and rebasing
git-merge git-rebase sample plaintext
1
vscode-gitlens-w-grafter
crown-add-ons / vscode-gitlens-w-grafter
GitLens with Grafter add-on for selecting only the changed files and folders you want in your PRs & merges. Enables customizable rules to filter out other changes—like ignoring a difference until the difference itself changes.
git git-branches git-branches-merge git-branching git-branching-workflow git-cherry-pick git-merge git-workflow gitlens
Language:TypeScript 0
cssbreno / git-comandos-essenciais
Iniciando agora na programação? Confere aqui os comandos mais importantes de Git pra facilitar sua vida.
comandos-git dicas-git git git-basics git-commit git-for-beginners git-guide git-init git-merge git-push git-push---help github-config guia-git practico principiantes markdown md
Juwono136 / learn_git_branch
This GitHub repository is for those who are new to learning git branching and merging.
git git-basics git-branch git-merge github teaching-materials

git-merge

balbuf / composer-git-merge-driver

joechea-aupp / github_tut

zawys / vscode-as-git-mergetool

jelmer / awesome-merge-drivers

exions / merge-upstream

hyperia-sk / remote-branch-housekeeping

yanamura / git-flow-merge-action

bzdgn / git-tutorial

WSMathias / Git-Cheat-Sheet

jamescherti / batchfetch

Siphalor / giup

thekoushik / safe-merge-files

AntonV0 / recipe-book

Ch-sriram / Just-Git-In

developer-shourav / Git-Branching-Marging

JulianaTagami / hiringcoders3-introduction-git-github

MrFlynn / git-absorb

PGSch / graph-git-repo

TomHerman11 / npm-install-or-yarn-after-git-merge-checkout-rebase

wavim / vscode-git-branch

web-full-stack / git

abraham-ukachi / git-begins

amirkangarloo / git-merge-vs-git-rebase

Anshul-Sonpure / Basic-Git-Commands

AntonV0 / javascript-homework

Chetandhangar / LearningGit

DanHouseman / AllYourRebase

jdevfullstack-tutorials / git-merge-resolve

Mahbub-Ferdous / Git_and_github-Study

MakeSchool-Tutorials / Git-to-Know-Branching

mistweaverco / diffconflicts.nvim

thinkverse / merge-via-cli

vi / for_merge

crown-add-ons / vscode-gitlens-w-grafter

cssbreno / git-comandos-essenciais

Juwono136 / learn_git_branch