Manual merge tool
Git conflicts parser Library
GitWand CLI — resolve Git conflicts from your terminal or CI pipeline
A NPM package to fix all git conflicts of a file at once.
Utility to automatically resolve composer.lock git conflicts
Resolve git conflicts within Atom
Interactive CLI to list and resolve merge conflicts one file at a time with progress tracking.
The directus schema command but it avoids git conflicts
Parse a JSON string that has git merge conflicts, resolving if possible
Enforces module path case sensitivity in Webpack
A fresh collection of media player themes for every use case!
AWS SDK for JavaScript Codecommit Client for Node.js, Browser and React Native
Merge Drivers CLI: A command-line interface to conveniently manage custom git merge drivers
To avoid style conflicts (CSS collisions/interference side effects) when using Tailwind CSS with other UI libraries like Antd, Vuetify etc.
Update Ember CLI projects
Merges lockfiles. Can automatically fix merge conflicts
Provides metadata and conversions from repository urls for GitHub, Bitbucket and GitLab
semantic-release plugin to back-merge a release into a develop branch
The command-line interface for Avo
Merges lockfiles. Can automatically fix merge conflicts
Merge Tailwind CSS classes without style conflicts
A rules-based JSON conflict resolver that parses Git conflict markers, reconstructs ours/theirs, and merges with deterministic strategies — beyond line-based merges.
Get raw git commits out of your repository using git-log(1).
Simplifies the graphile-build/graphile-build-pg inflection to trim the `ByFooIdAndBarId` from relations, etc
Git command that shows the blame on the lines that are in conflict
Kintsugi resolves conflicts in .pbxproj files, with the aim to resolve 99.9% of the conflicts automatically.
Fix git conflicts in TSV file.
It is a git merge driver for db/schema.rb of Ruby on Rails. It resolves some of the conflict automatically.
A gem to help editing rails credentials files with git merge conflicts.
Gx is 3 git related tools: gx-update, gx-publish, and gx-pull-check gx-update is a replacement for 'git pull' that includes an integrated conflict resolver. gx-pull-check integrates with github to provide the ability to test a pull requests against your tests.
A rails gem to help with keeping a changelog for teams while minimizing git conflict issues
Use this gem when a git conflict happens and it will open all conflicted files using vim (one file by tab).
Resolve git merge conflicts in Rails encrypted credentials by decrypting, merging, and re-encrypting them. Works with merge, rebase, and cherry-pick.
A custom git merge driver that auto-resolves the most common conflict in Rails schema files (db/schema.rb and, with the data_migrate gem, db/data_schema.rb): the define(version: N) line that gets bumped on every migration. Keeps the higher version on conflict and falls back to a normal merge conflict for any other diverging content.
Creates isolated database copies for each git branch, enabling parallel feature development without schema conflicts.
# mdtoc - Markdown Table of Contents Read Markdown files and output a table of contents. ## Installation Requirements: * [Ruby](https://www.ruby-lang.org/en/) (see [.ruby-version](./.ruby-version)) ```bash gem install mdtoc ``` ## Usage ```bash mdtoc --help Usage: mdtoc [options] files or directories... -h, --help Show this message -o, --output PATH Update a table of contents in the file at PATH -a, --[no-]append Append to the --output file if a <!-- mdtoc --> tag isn't found -c, --[no-]create Create the --output file if it does not exist ``` 1. Add a `<!-- mdtoc -->` tag to a Markdown file. ```bash echo '<!-- mdtoc -->' >> README.md ``` 2. Run `mdtoc` and specify input files or directories (eg. the "test/samples" directory) and an output file (eg. "README.md"). ```bash mdtoc -aco README.md test/samples ``` ## Example Rakefile Create a `Rakefile` with the contents below, then run [`rake`](https://github.com/ruby/rake) to: * `git pull` * `git add` any `*.md` files * Run `mdtoc` to update the generated table of contents in the ./README.md file * Git commit and push any changes ```ruby task default: %w[mdtoc] desc 'Update Markdown table of contents and push changes to the git repository' task :mdtoc do command = <<~CMD set -e if [ -n "$(git diff --name-only --diff-filter=U)" ]; then echo 'Error: conflicts exist' >&2 exit 1 fi mdtoc --append --create --output README.md docs/ git add *.md **/*.md git commit -qm 'Update TOC' || true git pull git push CMD sh command, verbose: false do |ok, status| unless ok fail "Failed with status: #{status.exitstatus}" end end end ``` See [andornaut/til](https://github.com/andornaut/til/blob/master/Rakefile) for an example. ## Development ### Setup Requirements: * [Bundler](https://bundler.io/) * [chruby](https://github.com/postmodern/chruby) (recommended) ```bash # Setup development environment bin/setup ``` ### Tasks ```bash # List rake tasks rake -T rake build # Build gem into the pkg directory rake default # Run the build, rubocop, sorbet and test tasks rake install # Build and install gem into system gems rake rubocop # Run RuboCop rake sorbet # Run the Sorbet type checker rake test # Run tests # Run mdtoc with test inputs ruby -Ilib bin/mdtoc test/samples # Run mdtoc with test inputs, and write to a newly created output file f=$(mktemp) && ruby -Ilib bin/mdtoc -aco ${f} test/samples ; cat ${f} ``` ### Publishing 1. Bump version in `lib/mdtoc/version.rb` 2. Run `bundle install` to update `Gemfile.lock` 3. Commit the changes 4. Run `rake release` to publish the gem to RubyGems, create the git tag, and push
No description provided.
No description provided.
No description provided.
No description provided.
No description provided.
No description provided.