Simple cmd line tool to help resolve git conflicts
☆10Apr 20, 2017Updated 9 years ago
Alternatives and similar repositories for git-conflict
Users that are interested in git-conflict are comparing it to the libraries listed below. We may earn a commission when you buy through links labeled 'Ad' on this page.
Sorting:
- Multiplayer letters game using elixir pheonix☆11Feb 11, 2016Updated 10 years ago
- Syntax highlight for logstash configuration files on all JetBrain IDEs (IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android St…☆24May 16, 2019Updated 7 years ago
- ☆16Nov 15, 2022Updated 3 years ago
- An example provisioning of a docker image using chef solo☆12Mar 10, 2018Updated 8 years ago
- Rimuove la spazzatura Grillesca dalla timeline facebook☆15Nov 14, 2015Updated 10 years ago
- 1-Click AI Models by DigitalOcean Gradient • AdDeploy popular AI models on DigitalOcean Gradient GPU virtual machines with just a single click. Zero configuration with optimized deployments.
- Provision AWS infrastructure using Terraform (By HashiCorp): an example of web application logging customer data☆12Dec 19, 2025Updated 9 months ago
- nodegh.io integration with Brackets☆24Oct 22, 2016Updated 9 years ago
- List of domain names of known recruitment consultants☆33Oct 28, 2020Updated 5 years ago
- Python Numbers for Humans☆26Sep 12, 2012Updated 14 years ago
- combo lists for dev testing☆16Jan 15, 2019Updated 7 years ago
- ☆15Jul 11, 2023Updated 3 years ago
- HTML5 Presentation Environment☆20Sep 24, 2026Updated 2 weeks ago
- Read temperature and humidity from dht11 and dht22 over gpio of omega2☆12Aug 4, 2017Updated 9 years ago
- CCAvenue Payment Gateway PHP Library☆14Mar 15, 2019Updated 7 years ago
- Bare Metal GPUs on DigitalOcean Gradient AI • AdPurpose-built for serious AI teams training foundational models, running large-scale inference, and pushing the boundaries of what's possible.
- Repository with projects used as samples in my blog posts☆16Oct 8, 2014Updated 12 years ago
- Hacker News Front Page Scrapper in R☆10Jan 7, 2018Updated 8 years ago
- This is a project created REST API using Node JS and Express JSto perform CRUD operations on a MongoDB database☆12Mar 3, 2017Updated 9 years ago
- Tutorial/hands-on lab for getting started with Docker Swarm☆10Nov 9, 2016Updated 9 years ago
- ☆12May 11, 2020Updated 6 years ago
- A purely humorous plugin for assisting your development.☆21Apr 28, 2015Updated 11 years ago
- Atom package synchronization☆13Jun 8, 2017Updated 9 years ago
- Shell scripts that make it really easy to archive and restore repositories between GitHub and AWS S3☆21Jan 8, 2020Updated 6 years ago
- ☆15Oct 15, 2015Updated 10 years ago
- Wordpress hosting with auto-scaling - Free Trial Offer • AdFully Managed hosting for WordPress and WooCommerce businesses that need reliable, auto-scalable performance. Cloudways SafeUpdates now available.
- Generate various kinds of Git conflicts, including conflicts suitable to interactively test a merge resolution tool. More fun stuff at: h…☆22Mar 23, 2023Updated 3 years ago
- ☆17Jan 3, 2021Updated 5 years ago
- Dynamically resize images for responsive applications.☆20Feb 11, 2019Updated 7 years ago
- 🤡 Tornado脚手架，🤖 技术栈：Tornado + MySQL + MongoDB + Redis + Celery + Nginx + Supervisor☆19Apr 8, 2022Updated 4 years ago
- Core deployment for Crowbar☆17May 31, 2021Updated 5 years ago
- Tornado and asyncio asynchronous ORM by peewee☆25May 25, 2021Updated 5 years ago
- Sample app using spring security rest plugin and AngularJS client☆20Feb 25, 2014Updated 12 years ago
- A stream implementation of the bunyan cli tool's pretty printing capabilities☆57Dec 5, 2017Updated 8 years ago
- A simple example that demonstrates how to set up MongoDB connections in an Express app.☆17Jan 9, 2021Updated 5 years ago
- Virtual machines for every use case on DigitalOcean • AdGet dependable uptime with 99.99% SLA, simple security tools, and predictable monthly pricing with DigitalOcean's virtual machines, called Droplets.
- Small SASS library inspired by google material design guidelines☆16Aug 4, 2014Updated 12 years ago
- Sample Ruby on Rails application demonstrating integration with AWS services.☆28Feb 28, 2020Updated 6 years ago
- Official SUSE OpenStack Cloud documentation☆13Nov 2, 2022Updated 3 years ago
- Linter plugin for SCSS, using scss-lint☆36Jul 28, 2023Updated 3 years ago
- Serverless Application Model Made Infinitely Easier☆21Mar 29, 2021Updated 5 years ago
- 💻 Command-line interface (CLI) for English Accents Map☆12Aug 11, 2017Updated 9 years ago
- Run plug-able Django apps without a settings module☆15Oct 20, 2016Updated 9 years ago