A plugin to visualise and resolve merge conflicts in neovim

git-conflict.nvim


Description


Refined GitHub is a Safari extension that simplifies the GitHub.com interface and adds useful features.â  Highlights- Linkifies issue/PR references and URLs in code.- Makes whitespace characters visible.- Reduces tabsâ size to 4 spaces instead of 8.- Adds one-click merge conflict fixers.- Adds reaction avatars showing who reacted to a comment.- Adds a button to revert all the changes to a file in a PR.- Adds a build/CI status icon next to the repoâs name.- Adds a button to view the source of Markdown files.- Shows PRs that touch the current file.- Highlights the most useful comment in conversations.- Shows the first Git tag a merged PR was included in.- Adds a link to an automatic changelog for each tag/release.- Adds possible related pages and alternatives on 404 pages.- Displays the age of the repository in the sidebar.And so much more! 200+ features. See the website for a full list of features.The GITHUB and REFINED GITHUB trademarks are owned by GitHub, Inc. and used under license.




:octocat: Browser extension that simplifies the GitHub interface and adds useful features

MIT License

refined-github

Please use System.IO.Compression! A fork of the DotNetZip project without signing with a solution that compiles cleanly. This project aims to follow semver to avoid versioning conflicts.  DotNetZip is a FAST, FREE class library and toolset for manipulating zip files. Use VB, C# or any .NET language to easily create, extract, or update zip files.

Other

DotNetZip.Semverd


Description


** Featured by Apple on "Best New Apps & Updates" and "Best Calendar Apps" **Take control of your day and achieve your goals with SuperPlanner.SuperPlanner is a day planner that allows you to plan your day and focus using time blocking.With built-in calendar and task management features, you can easily organize your activities, calendar events, and tasks in one convenient daily planner. The user-friendly interface and powerful features make it easy to stay organized and on top of your schedule.As a schedule planner, it combines an agenda and organizer to help you boost your productivity and manage your routine. The visual timeline and time blocking features help you stay focused and avoid procrastination.You'll have the tools you need to stay organized and productive, no matter how busy your schedule may be. You can even set reminders for important activities, calendar events and tasks, so you never forget anything important.The app is perfect for people with ADHD, as it provides a comprehensive view of your entire day. You can see how your activities and appointments fit into your daily schedule, helping you avoid conflicts and manage your time more effectively._____________________FULLY FEATURED:SuperPlanner offers a comprehensive set of features to help you manage your day. It supports activities, calendar events, and tasks, as well as repetition rules and lists.You can also customize your digital planner with colors, icons, and themes to suit your preferences. Plus, it offers notifications, widgets and other helpful features to keep you organized and on track._____________________PRIVACY FOCUSED:SuperPlanner is designed with privacy in mind. No login or authentication is required, and your data is securely synced across all your devices using iCloud._____________________Take control of your day, focus and boost your productivity with SuperPlanner.Download the app today and start achieving your goals!_____________________Privacy Policy: http://superplanner.app/privacy-policyTerms of Use: https://superplanner.app/terms




 macOS command line tool for developers – The ultimate tool to manage your Mac. It provides a huge set of command line commands that automatize the usage of your Mac.

Mac-CLI

Erlang state "monad" with merge/conflict-resolution capabilities. Useful for Riak.

statebox

A CLI tool to reduce the friction between data scientists by reducing git conflicts removing notebook metadata and gracefully resolving git conflicts.

databooks

Plugin for Sublime Text to help identify conflicting key mappings.