Discover taljacob2/git-merge-and-ignore Open Source project

Stars
3
Rank 3,963,521 (Top 79 %)
Language
Shell
License
MIT License
Created over 2 years ago
Updated about 2 years ago

taljacob2

There are no reviews yet. Be the first to send feedback to the community and the maintainers!

A small addition for git merge to "ignore" incoming changes to certain local files / folders when merging, in the case where the remote version and the local version of these files do not conflict.

employee-manager

A website example for deploying Springboot + SQL + Angular to Heroku, via Gradle.

Java

mivneiNetunimEx2

An example for an organized project in C++.

C++

StockManagementSystem_ex3

Spring Boot Application For Stock Management System

CSS

git-remerge

An addition for git merge to be able to re-calculate the "merge", when two branches have already been merged.

Shell

db-vcs-ci-server

Implemented in .NET Core 6 Minimal Api.

git-log-merge

A small addition for git log to view all the commits that were merged on a certain merge commit.

Shell

Java_Decompiler

Run this script to decompile all .class / .jar files back to .java files! The hierarchy of the files remains the same!

db-vcs-ci-client

"db-vcs-ci" is a tool that automatically backups your database along your code, and inserts the backups to your commits, so you could source-control the backups of your database.

Shell

nand2tetris_HardwareSimulator3.0

HardwareSimulator3.0 [2021] is an unofficial remaster for HardwareSimulator version 2.5 [2005], for better experience. Made privately by Tal Jacob.

Java

taljacob2/git-merge-and-ignore

taljacob2

Reviews

Repository Details

More Repositories