Alternatives to Sublime Merge

Our whole DevOps stack consists of the following tools:

• GitHub (incl. GitHub Pages/Markdown for Documentation, GettingStarted and HowTo's) for collaborative review and code management tool
• Respectively Git as revision control system
• SourceTree as Git GUI
• Visual Studio Code as IDE
• CircleCI for continuous integration (automatize development process)
• Prettier / TSLint / ESLint as code linter
• SonarQube as quality gate
• Docker as container management (incl. Docker Compose for multi-container application management)
• VirtualBox for operating system simulation tests
• Kubernetes as cluster management for docker containers
• Heroku for deploying in test environments
• nginx as web server (preferably used as facade server in production environment)
• SSLMate (using OpenSSL) for certificate management
• Amazon EC2 (incl. Amazon S3) for deploying in stage (production-like) and production environments
• PostgreSQL as preferred database system
• Redis as preferred in-memory database/store (great for caching)

The main reason we have chosen Kubernetes over Docker Swarm is related to the following artifacts:

• Key features: Easy and flexible installation, Clear dashboard, Great scaling operations, Monitoring is an integral part, Great load balancing concepts, Monitors the condition and ensures compensation in the event of failure.
• Applications: An application can be deployed using a combination of pods, deployments, and services (or micro-services).
• Functionality: Kubernetes as a complex installation and setup process, but it not as limited as Docker Swarm.
• Monitoring: It supports multiple versions of logging and monitoring when the services are deployed within the cluster (Elasticsearch/Kibana (ELK), Heapster/Grafana, Sysdig cloud integration).
• Scalability: All-in-one framework for distributed systems.
• Other Benefits: Kubernetes is backed by the Cloud Native Computing Foundation (CNCF), huge community among container orchestration tools, it is an open source and modular tool that works with any OS.

Tower appears to be between GitKraken and SourceTree in detail, but gave two scary error dialogs when attempting to merge resulted in a conflict. Doing the same in SourceTree just worked and showed the conflict in its handy file view that's always visible (unlike Tower's mere "Merge branch 'X' into develop" message when the commit is selected).

Both GitKraken and Tower lack the commit hash in their history overview, requiring one to select a commit to see it.

GitKraken appears to be the only Windows 10 Git GUI suitable for night shifts, but like Tower is only free for 30 days, unlike SourceTree.

Tower appears to be between GitKraken and SourceTree in detail, but gave two scary error dialogs when attempting to merge resulted in a conflict. Doing the same in SourceTree just worked and showed the conflict in its handy file view that's always visible (unlike Tower's mere "Merge branch 'X' into develop" message when the commit is selected).

Both GitKraken and Tower lack the commit hash in their history overview, requiring one to select a commit to see it.

GitKraken appears to be the only Windows 10 Git GUI suitable for night shifts, but like Tower is only free for 30 days, unlike SourceTree.

GitKraken is the best git client so far. The user interface is very friendly. Everything is easy to do with this tool. A branch tree vizualization is very clear. I've tried SourceTree and I got lost in such many panels. Also performance of SourceTree is not as goot as GitKraken. I like Sublime Merge but it doesn't have so many features as the other tools. I've choosen GitKraken and as bonus I got GitKraken Glo that is the next perfect tool.

I've been in the #frontend game for about 7 years now. I started coding in Sublime Text because all of the tutorials I was doing back then everyone was using it. I found the speed amazing compared to some other tools at the time. I kept using Sublime Text for about 4-5 years.

I find Sublime Text lacks some functionality, after all it is just a text editor rather than a full fledged IDE. I finally converted over to PhpStorm as I was working with Magento and Magento as you know is mainly #PHP based.

This was amazing all the features in PhpStorm I loved, the debugging features, and the control click feature when you click on a dependency or linked file it will take you to that file. It was great.

PhpStorm is kind of slow, I found that Prettier was taking a long time to format my code, and it just was lagging a lot so I was looking for alternatives. After watching some more tutorial videos I noticed that everyone was using Visual Studio Code. So I gave it a go, and its amazing.

It has support for everything I need with the plugins and the integration with Git is amazing. The speed of this IDE is blazing fast, and I wouldn't go back to using PhpStorm anymore. I highly recommend giving Visual Studio Code a try!

At labinator.com, we use HTML5, CSS 3, Sass, Vanilla.JS and PHP when building our premium WordPress themes and plugins. When writing our codes, we use Sublime Text and Visual Studio Code depending on the project. We run Manjaro and Debian operating systems in our office. Manjaro is a great desktop operating system for all range of tasks while Debian is a solid choice for servers.

WordPress became a very popular choice when it comes to content management systems and building websites. It is easy to learn and has a great community behind it. The high number of plugins as well that are available for WordPress allows any user to customize it depending on his/her needs.

For development, HTML5 with Sass is our go-to choice when building our themes.

Main Advantages Of Sass:

• It's CSS syntax friendly
• It offers variables
• It uses a nested syntax
• It includes mixins
• Great community and online support.
• Great documentation that is easy to read and follow.

As for PHP, we always thrive to use PHP 7.3+. After the introduction of PHP 7, the WordPress development process became more stable and reliable than before. If you a developer considering PHP 7.3+ for your project, it would be good to note the following benefits.

The Benefits Of Using PHP:

• Open Source.
• Highly Extendible.
• Easy to learn and read.
• Platform independent.
• Compatible with APACHE.
• Low development and maintenance cost.
• Great community and support.
• Detailed documentation that has everything you need!

Why PHP 7.3+?

• Flexible Heredoc & Nowdoc Syntaxes - Two key methods for defining strings within PHP. They also became easier to read and more reliable.
• A good boost in performance speed which is extremely important when it comes to WordPress development.

Tower appears to be between GitKraken and SourceTree in detail, but gave two scary error dialogs when attempting to merge resulted in a conflict. Doing the same in SourceTree just worked and showed the conflict in its handy file view that's always visible (unlike Tower's mere "Merge branch 'X' into develop" message when the commit is selected).

Both GitKraken and Tower lack the commit hash in their history overview, requiring one to select a commit to see it.

GitKraken appears to be the only Windows 10 Git GUI suitable for night shifts, but like Tower is only free for 30 days, unlike SourceTree.