jdevfullstack-tutorials/git-merge-resolve

the never ending headache of git merge conflicts, so here we are to solve it !

Size: 3.91 KB - Last synced: about 1 month ago - Pushed: about 1 month ago - Stars: 1 - Forks: 0

Anshul-Sonpure/Basic-Git-Commands

Basic Git Commands and Workflow

Size: 12 MB - Last synced: about 1 month ago - Pushed: over 1 year ago - Stars: 1 - Forks: 0

joechea-aupp/github_tut

Github 1️⃣0️⃣1️⃣

Language: Python - Size: 1.71 MB - Last synced: about 1 month ago - Pushed: about 1 month ago - Stars: 50 - Forks: 87

yanamura/git-flow-merge-action

Language: TypeScript - Size: 1.28 MB - Last synced: 11 days ago - Pushed: 3 months ago - Stars: 15 - Forks: 0

balbuf/composer-git-merge-driver

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

Language: PHP - Size: 23.4 KB - Last synced: 14 days ago - Pushed: about 1 year ago - Stars: 123 - Forks: 7

WSMathias/Git-Cheat-Sheet

Practical Git Cheat Sheet, Encompassing Key Use Cases and Command Structures

Size: 66.4 KB - Last synced: 2 months ago - Pushed: 2 months ago - Stars: 5 - Forks: 8

AishwaryaSubash/learn-git

Git: Exploring Version Control Basics

Language: HTML - Size: 181 KB - Last synced: 29 days ago - Pushed: 3 months ago - Stars: 0 - Forks: 0

vi/for_merge

A test repository to demonstrate git merging and rebasing

Size: 10.7 KB - Last synced: 3 months ago - Pushed: 3 months ago - Stars: 1 - Forks: 2

gopal-jogi/git_task8

git

Language: Python - Size: 6.84 KB - Last synced: 4 months ago - Pushed: 4 months ago - Stars: 0 - Forks: 1

bzdgn/git-tutorial

Git tutorial with command line

Size: 349 KB - Last synced: 5 months ago - Pushed: over 3 years ago - Stars: 6 - Forks: 2

exions/merge-upstream

⤵️ Merge in changes from upstream. Useful for syncing upstream changes to fork.

Size: 16.6 KB - Last synced: 2 months ago - Pushed: 6 months ago - Stars: 23 - Forks: 17

ShanzyHolm/BBC_educational_app-Landmarks Fork of corrirc/bbc_app

CodeClan Project 2. Week-long JavaScript Group Project - It is a single-page educational app which uses MongoDB, API with keys, webpack, CSS, and HTML. Aims: To gain experience working in a team with other developers - to understand some of the challenges this creates and ways to overcome them. To have the opportunity to use Agile working methods. To become more confident using Git/GitHub for a multi person project. To consolidate learning from the JavaScript module. To investigate some JavaScript libraries you haven't used before (learning how to read docs is an invaluable skill). To create a project using core Javascript - this means NO front-end frameworks or jQuery are allowed. TDD - unit testing of models where appropriate. Some application of Agile concepts e.g. a morning standup, sprints, a kanban board (Trello). Regular Git commits and use of branches with frequent merges.

Language: JavaScript - Size: 23.6 MB - Last synced: 8 months ago - Pushed: over 5 years ago - Stars: 0 - Forks: 0

MrFlynn/git-absorb

:wrench: An extension for Git that combines multiple repositories into a single repository.

Language: Shell - Size: 22.5 KB - Last synced: 16 days ago - Pushed: over 3 years ago - Stars: 2 - Forks: 1

fuadreza/new-example-project

Size: 1000 Bytes - Last synced: 9 months ago - Pushed: almost 4 years ago - Stars: 0 - Forks: 0

ronald-kimeli/challenge-git-task

Node js task based on challenge kit

Language: JavaScript - Size: 19.5 KB - Last synced: 9 months ago - Pushed: 10 months ago - Stars: 0 - Forks: 0

MohamedGElsharkawy/GitSheet

This repo demonstrates the playing journey with Git :rocket: :octocat:

Size: 450 KB - Last synced: 10 months ago - Pushed: over 2 years ago - Stars: 0 - Forks: 0

lalalam123/Software-Engineering-Practices

Guidelines for software engineering, e.g. writing clear Git commit messages, defining informative issue types and some cyber security topics.

Size: 19.5 KB - Last synced: 4 months ago - Pushed: 10 months ago - Stars: 0 - Forks: 0

myst729/git-diff-merge-loss

Code loss in resolving git merge conflict

Language: Vue - Size: 11.7 KB - Last synced: 11 months ago - Pushed: 11 months ago - Stars: 0 - Forks: 0

Siphalor/giup

Python script for automated, iterative git merges and publishing

Language: Python - Size: 76.2 KB - Last synced: about 14 hours ago - Pushed: 6 months ago - Stars: 2 - Forks: 0

Ch-sriram/Just-Git-In

Implementation of beginner to advanced concepts of git and GitHub.

Size: 439 KB - Last synced: about 1 year ago - Pushed: over 3 years ago - Stars: 1 - Forks: 1

open-craft-guild/prze-merge-2017-kurwa 📦

Git Merge 2017 Recap by @webknjaz and @anxolerd (never finished)

Language: JavaScript - Size: 20.5 KB - Last synced: about 1 year ago - Pushed: about 7 years ago - Stars: 0 - Forks: 0

MBadriNarayanan/VersionControlWithGit 📦

Course offered by Atlassian and Coursera. Taught by Steve Byrnes.

Size: 195 KB - Last synced: about 1 year ago - Pushed: almost 4 years ago - Stars: 0 - Forks: 0

AntonV0/recipe-book

Project #60 of Codecademy's Full Stack Engineer Career Path

Size: 4.88 KB - Last synced: about 1 year ago - Pushed: over 1 year ago - Stars: 2 - Forks: 0

abraham-ukachi/git-begins

A repository created as part of a school assignment on Git & Github that contains ~4 jobs.

Size: 27.3 KB - Last synced: about 1 year ago - Pushed: over 1 year ago - Stars: 1 - Forks: 0

jelmer/awesome-merge-drivers

List of great merge drivers for git and other version control tools

Size: 0 Bytes - Last synced: 2 days ago - Pushed: over 1 year ago - Stars: 1 - Forks: 0

AntonV0/javascript-homework

Project #59 of Codecademy's Full Stack Engineer Career Path

Language: JavaScript - Size: 2.93 KB - Last synced: about 1 year ago - Pushed: over 1 year ago - Stars: 1 - Forks: 0

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.

Size: 1000 Bytes - Last synced: about 1 year ago - Pushed: over 1 year ago - Stars: 2 - Forks: 0

zawys/vscode-as-git-mergetool

VS Code extension providing diff editor layouts & more for 3-way merging

Language: TypeScript - Size: 6.34 MB - Last synced: about 1 year ago - Pushed: over 2 years ago - Stars: 42 - Forks: 1

ILYA-NASA/Database_information_system

Educational group project

Language: PowerShell - Size: 335 KB - Last synced: about 1 year ago - Pushed: over 1 year ago - Stars: 0 - Forks: 13

amirkangarloo/git-merge-vs-git-rebase

Git Merge VS Git Rebase with one is better

Size: 131 KB - Last synced: about 1 year ago - Pushed: over 1 year ago - Stars: 0 - Forks: 0

web-full-stack/git

git squash vs git merge vs git rebase

Language: Shell - Size: 5.62 MB - Last synced: about 1 year ago - Pushed: over 1 year ago - Stars: 2 - Forks: 0

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 ⛑️🛠️

Language: Shell - Size: 6.3 MB - Last synced: about 1 year ago - Pushed: over 3 years ago - Stars: 2 - Forks: 0

JulianaTagami/hiringcoders3-introduction-git-github

Hiring Coders 3-Introduction Git/GitHub

Language: JavaScript - Size: 1000 Bytes - Last synced: about 1 year ago - Pushed: about 2 years ago - Stars: 2 - Forks: 0

LaietiMcLean/Practices-git-group Fork of NereaLM/Practices-git-group

Size: 281 KB - Last synced: about 1 year ago - Pushed: about 2 years ago - Stars: 0 - Forks: 0

LaietiMcLean/git-practice-group

Language: JavaScript - Size: 194 KB - Last synced: about 1 year ago - Pushed: about 2 years ago - Stars: 0 - Forks: 1

LaietiMcLean/git-practice-react Fork of orianabreu/git-practice-react

Language: JavaScript - Size: 319 KB - Last synced: about 1 year ago - Pushed: about 2 years ago - Stars: 0 - Forks: 0

Chetandhangar/LearningGit

This repo is create to learn git features like:- branching , PR, MergePR and many more.

Language: HTML - Size: 1000 Bytes - Last synced: about 1 year ago - Pushed: over 3 years ago - Stars: 1 - Forks: 0

guna7222/Git-and-GitHub-essentials

Git and GitHub Essentials

Size: 1.95 KB - Last synced: 12 months ago - Pushed: about 3 years ago - Stars: 0 - Forks: 0

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!

Size: 662 KB - Last synced: about 1 year ago - Pushed: over 3 years ago - Stars: 1 - Forks: 2

thekoushik/safe-merge-files

Merge two files like git

Language: JavaScript - Size: 71.3 KB - Last synced: about 2 months ago - Pushed: over 1 year ago - Stars: 2 - Forks: 0

thinkverse/merge-via-cli

Testing merging via CLI

Language: HTML - Size: 5.86 KB - Last synced: about 1 year ago - Pushed: over 3 years ago - Stars: 1 - Forks: 0

Souloist/rebase-git-workflow

Example of a git workflow using rebasing

Size: 10.7 KB - Last synced: 11 months ago - Pushed: over 5 years ago - Stars: 0 - Forks: 0

hyperia-sk/remote-branch-housekeeping

Simple and efficient way to delete remote branches from git repository.

Language: Shell - Size: 23.4 KB - Last synced: about 1 year ago - Pushed: over 6 years ago - Stars: 15 - Forks: 1