structure_conflict_resolver
Advanced tools
Ruby 💎 tool for resolving conflicts in db/structure.sql
Do you hate it when this happens to you?
Now you can easily resolve the most common conflicts in the versions list!
...
('20180313190020'),
<<<<<<< HEAD
('20180319155607');
=======
('20180319231815');
>>>>>>> some important commit
...
('20180313190020'),
('20180319155607'),
('20180319231815');
gem install structure_conflict_resolver
You probably won't want to add this to your Gemfile, it's more of a CLI tool.
When you run into a merge conflict on db/structure.sql, give this a try:
structure_conflict_resolver db/structure.sql
It'll smartly resolve any conflicts around the version numbers at the bottom.
Any logical conflicts in the actual table descriptions... you'll have to fix yourself!
MIT
FAQs
Unknown package
We found that structure_conflict_resolver demonstrated a not healthy version release cadence and project activity because the last version was released a year ago. It has 1 open source maintainer collaborating on the project.
Did you know?
Socket for GitHub automatically highlights issues in each pull request and monitors the health of all your open source dependencies. Discover the contents of your packages and block harmful activity before you install or update your dependencies.
Security News
Research
The Socket Research Team breaks down a malicious wrapper package that uses obfuscation to harvest credentials and exfiltrate sensitive data.
Research
Security News
Attackers used a malicious npm package typosquatting a popular ESLint plugin to steal sensitive data, execute commands, and exploit developer systems.
Security News
The Ultralytics' PyPI Package was compromised four times in one weekend through GitHub Actions cache poisoning and failure to rotate previously compromised API tokens.