Alternatives to Sublime Merge logo

Alternatives to Sublime Merge

SourceTree, GitKraken, Sublime Text, Tower, and Fork are the most popular alternatives and competitors to Sublime Merge.
114
205
+ 1
46

What is Sublime Merge and what are its top alternatives?

A snappy UI, three-way merge tool, side-by-side diffs, syntax highlighting, and more. Evaluate for free – no account, tracking, or time limits.
Sublime Merge is a tool in the Source Code Management Desktop Apps category of a tech stack.

Top Alternatives to Sublime Merge

  • SourceTree
    SourceTree

    Use the full capability of Git and Mercurial in the SourceTree desktop app. Manage all your repositories, hosted or local, through SourceTree's simple interface. ...

  • GitKraken
    GitKraken

    The downright luxurious Git client for Windows, Mac and Linux. Cross-platform, 100% standalone, and free. ...

  • Sublime Text
    Sublime Text

    Sublime Text is available for OS X, Windows and Linux. One license is all you need to use Sublime Text on every computer you own, no matter what operating system it uses. Sublime Text uses a custom UI toolkit, optimized for speed and beauty, while taking advantage of native functionality on each platform. ...

  • Tower
    Tower

    Use all of Git's powerful feature set - in a GUI that makes you more productive. ...

  • Fork
    Fork

    Manage your repositories without leaving the application. Organize the repositores into categories. Fork's Diff Viewer provides a clear view to spot the changes in your source code quickly. ...

  • JavaScript
    JavaScript

    JavaScript is most known as the scripting language for Web pages, but used in many non-browser environments as well such as node.js or Apache CouchDB. It is a prototype-based, multi-paradigm scripting language that is dynamic,and supports object-oriented, imperative, and functional programming styles. ...

  • Git
    Git

    Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency. ...

  • GitHub
    GitHub

    GitHub is the best place to share code with friends, co-workers, classmates, and complete strangers. Over three million people use GitHub to build amazing things together. ...

Sublime Merge alternatives & related posts

SourceTree logo

SourceTree

10.4K
7.9K
727
A free Git GUI client for Windows and macOS
10.4K
7.9K
+ 1
727
PROS OF SOURCETREE
  • 205
    Visual history and branch view
  • 164
    Beautiful UI
  • 134
    Easy repository browsing
  • 87
    Gitflow support
  • 75
    Interactive stage or discard by hunks or lines
  • 22
    Great branch visualization
  • 18
    Ui/ux and user-friendliness
  • 8
    Best Git Client UI/Features
  • 7
    Search commit messages
  • 5
    Available for Windows and macOS
  • 1
    Log only one file
  • 1
    Search file content
CONS OF SOURCETREE
  • 12
    Crashes often
  • 8
    So many bugs
  • 7
    Fetching is slow sometimes
  • 5
    No dark theme (Windows)
  • 5
    Extremely slow
  • 5
    Very unstable
  • 4
    Can't select text in diff (windows)
  • 3
    Freezes quite frequently
  • 3
    Can't scale window from top corners
  • 2
    UI blinking
  • 2
    Windows version worse than mac version
  • 2
    Installs to AppData folder (windows)
  • 2
    Diff makes tab indentation look like spaces
  • 2
    Windows and Mac versions are very different
  • 2
    Diff appears as if space indented even if its tabs
  • 2
    Doesn't have an option for git init
  • 2
    Useless for merge conflict resolution
  • 2
    Doesn't differentiate submodules from parent repos
  • 2
    Requires bitbucket account
  • 1
    Generally hard to like
  • 1
    No reflog support
  • 1
    Bases binary check on filesize
  • 1
    Can't add remotes by right clicking remotes (windows)

related SourceTree posts

Simon Reymann
Senior Fullstack Developer at QUANTUSflow Software GmbH · | 30 upvotes · 9.2M views

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.
See more
Cees Timmerman

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.

See more
GitKraken logo

GitKraken

719
908
279
Git GUI Client for Windows Mac and Linux built on Electron
719
908
+ 1
279
PROS OF GITKRAKEN
  • 59
    Dark theme
  • 34
    Best linux git client
  • 29
    Great overview
  • 21
    Full featured client
  • 20
    Gitflow support
  • 19
    Beautiful UI
  • 18
    Very easy to use
  • 16
    Graph
  • 13
    Works great on both linux and windows
  • 13
    Effortless
  • 6
    Easy Merge Conflict Tool
  • 5
    Amazing Github and Bitbucket integration
  • 4
    Great UX
  • 3
    Integration with GitHub
  • 3
    Automatic Repo Discovery
  • 3
    Submodule support
  • 3
    Easy to Learn and Setup
  • 3
    Super fast
  • 2
    Fuzzy find (CTRL P)
  • 1
    Very user friendly
  • 1
    Much more stable than source tree
  • 1
    Great for non-dev users
  • 1
    Because it has Linux client
  • 1
    Command palette (CTRL Shift P)
CONS OF GITKRAKEN
  • 3
    Extremely slow when working with large repositories
  • 3
    No edit/fixup in interactive rebase
  • 3
    Hangs occasionally (not as bad as sourcetree)
  • 2
    Not as many features as sourcetree
  • 2
    Do not allow to directly edit staging area
  • 2
    Does not work like a Mac app

related GitKraken posts

Cees Timmerman

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.

See more

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.

See more
Sublime Text logo

Sublime Text

33.2K
27.2K
4K
A sophisticated text editor for code, markup and prose.
33.2K
27.2K
+ 1
4K
PROS OF SUBLIME TEXT
  • 720
    Lightweight
  • 652
    Plugins
  • 641
    Super fast
  • 468
    Great code editor
  • 442
    Cross platform
  • 280
    Nice UI
  • 260
    Unlimited trial
  • 153
    Cmd + d is the best command ever
  • 92
    Great community
  • 46
    Package control, modules
  • 26
    Mac OS X support
  • 23
    Easy to get started with
  • 22
    Monokai
  • 21
    Everything you need without the bloat
  • 21
    Built in Python
  • 18
    Easy
  • 14
    Speed
  • 12
    Session & edit resuming
  • 10
    Package Control
  • 9
    Well Designed
  • 8
    Multiple selections
  • 7
    ALT + CMD + DOWN is the best command ever
  • 7
    Nice
  • 7
    Fast, simple and lightweight
  • 5
    It's easy to use, beautiful, simple, and plugins rule
  • 5
    So futuristic and convenient
  • 5
    ALT + F3 the best command ever
  • 5
    Great
  • 4
    Find anything fast within entire project
  • 4
    Easy to use
  • 4
    Free
  • 4
    Simple and clean design
  • 3
    Hackable
  • 3
    Pretty
  • 3
    UI + plugins
  • 3
    Sublime Merge (Git Integration)
  • 2
    Totally customizable
  • 2
    Color schemes and cmd+d
  • 2
    Material theme best theme forever
  • 0
    Const
CONS OF SUBLIME TEXT
  • 8
    Steep learning curve
  • 6
    Everything
  • 4
    Flexibility to move file
  • 4
    Number of plugins doing the same thing
  • 4
    Doesn't act like a Mac app
  • 3
    Not open sourced
  • 2
    Don't have flutter integration
  • 2
    Forces you to buy license

related Sublime Text posts

Johnny Bell

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!

See more
Labinator Team

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.
See more
Tower logo

Tower

211
359
80
The most powerful Git client for Mac & Windows
211
359
+ 1
80
PROS OF TOWER
  • 19
    Git
  • 16
    Just works
  • 10
    Version control
  • 6
    Awesome
  • 6
    Simple layout
  • 4
    Multiple windows
  • 3
    Automatic repo discovery
  • 3
    Multiple tabs
  • 2
    Submodule support
  • 2
    Github integration
  • 2
    Full featured client
  • 2
    Uses standard git terminology and methods
  • 2
    Gitflow support
  • 2
    Interactive stage or discard by hunks or lines
  • 1
    SAS
CONS OF TOWER
  • 5
    Expensive
  • 4
    Subscription based
  • 1
    No side by side diff
  • 0
    Merge conflict resolution impossible/unclear

related Tower posts

Cees Timmerman

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.

See more
Fork logo

Fork

198
253
126
Fast and Friendly Git Client for Mac
198
253
+ 1
126
PROS OF FORK
  • 19
    One of the easiest and fastest git GUIs
  • 14
    Nice UX
  • 13
    Does the job way better than others
  • 13
    Fast, Great support, Does-it-all, blazing fast
  • 11
    Dark theme
  • 9
    Intuitive interactive rebase and conflict resolution UI
  • 9
    Gitflow support
  • 7
    Excellent commit history tree view
  • 5
    This even looks the same as SourceTree
  • 4
    Repository Manager
  • 3
    Built-in developer feedback
  • 3
    Countless quality of life features
  • 2
    Github Notifications
  • 2
    Not buggy, works smoothly
  • 2
    Keyaboard-only
  • 2
    Visual branch history
  • 2
    Reflog support
  • 1
    Git ammend
  • 1
    Smart 'Open in' menu; e.g. explorer, bit, giithub .
  • 1
    Interactive rebase window
  • 1
    Native application
  • 1
    Intuitive merge conflict resolution
  • 1
    Unique Activity Manager shows current/past operations
CONS OF FORK
  • 2
    Poorly written license
  • 1
    Stability is fragile when looking deeply into history
  • 1
    Merges that require interactive user decision

related Fork posts

JavaScript logo

JavaScript

350.5K
266.9K
8.1K
Lightweight, interpreted, object-oriented language with first-class functions
350.5K
266.9K
+ 1
8.1K
PROS OF JAVASCRIPT
  • 1.7K
    Can be used on frontend/backend
  • 1.5K
    It's everywhere
  • 1.2K
    Lots of great frameworks
  • 896
    Fast
  • 745
    Light weight
  • 425
    Flexible
  • 392
    You can't get a device today that doesn't run js
  • 286
    Non-blocking i/o
  • 236
    Ubiquitousness
  • 191
    Expressive
  • 55
    Extended functionality to web pages
  • 49
    Relatively easy language
  • 46
    Executed on the client side
  • 30
    Relatively fast to the end user
  • 25
    Pure Javascript
  • 21
    Functional programming
  • 15
    Async
  • 13
    Full-stack
  • 12
    Setup is easy
  • 12
    Its everywhere
  • 11
    JavaScript is the New PHP
  • 11
    Because I love functions
  • 10
    Like it or not, JS is part of the web standard
  • 9
    Can be used in backend, frontend and DB
  • 9
    Expansive community
  • 9
    Future Language of The Web
  • 9
    Easy
  • 8
    No need to use PHP
  • 8
    For the good parts
  • 8
    Can be used both as frontend and backend as well
  • 8
    Everyone use it
  • 8
    Most Popular Language in the World
  • 8
    Easy to hire developers
  • 7
    Love-hate relationship
  • 7
    Powerful
  • 7
    Photoshop has 3 JS runtimes built in
  • 7
    Evolution of C
  • 7
    Popularized Class-Less Architecture & Lambdas
  • 7
    Agile, packages simple to use
  • 7
    Supports lambdas and closures
  • 6
    1.6K Can be used on frontend/backend
  • 6
    It's fun
  • 6
    Hard not to use
  • 6
    Nice
  • 6
    Client side JS uses the visitors CPU to save Server Res
  • 6
    Versitile
  • 6
    It let's me use Babel & Typescript
  • 6
    Easy to make something
  • 6
    Its fun and fast
  • 6
    Can be used on frontend/backend/Mobile/create PRO Ui
  • 5
    Function expressions are useful for callbacks
  • 5
    What to add
  • 5
    Client processing
  • 5
    Everywhere
  • 5
    Scope manipulation
  • 5
    Stockholm Syndrome
  • 5
    Promise relationship
  • 5
    Clojurescript
  • 4
    Because it is so simple and lightweight
  • 4
    Only Programming language on browser
  • 1
    Hard to learn
  • 1
    Test
  • 1
    Test2
  • 1
    Easy to understand
  • 1
    Not the best
  • 1
    Easy to learn
  • 1
    Subskill #4
  • 0
    Hard 彤
CONS OF JAVASCRIPT
  • 22
    A constant moving target, too much churn
  • 20
    Horribly inconsistent
  • 15
    Javascript is the New PHP
  • 9
    No ability to monitor memory utilitization
  • 8
    Shows Zero output in case of ANY error
  • 7
    Thinks strange results are better than errors
  • 6
    Can be ugly
  • 3
    No GitHub
  • 2
    Slow

related JavaScript posts

Zach Holman

Oof. I have truly hated JavaScript for a long time. Like, for over twenty years now. Like, since the Clinton administration. It's always been a nightmare to deal with all of the aspects of that silly language.

But wowza, things have changed. Tooling is just way, way better. I'm primarily web-oriented, and using React and Apollo together the past few years really opened my eyes to building rich apps. And I deeply apologize for using the phrase rich apps; I don't think I've ever said such Enterprisey words before.

But yeah, things are different now. I still love Rails, and still use it for a lot of apps I build. But it's that silly rich apps phrase that's the problem. Users have way more comprehensive expectations than they did even five years ago, and the JS community does a good job at building tools and tech that tackle the problems of making heavy, complicated UI and frontend work.

Obviously there's a lot of things happening here, so just saying "JavaScript isn't terrible" might encompass a huge amount of libraries and frameworks. But if you're like me, yeah, give things another shot- I'm somehow not hating on JavaScript anymore and... gulp... I kinda love it.

See more
Conor Myhrvold
Tech Brand Mgr, Office of CTO at Uber · | 44 upvotes · 10M views

How Uber developed the open source, end-to-end distributed tracing Jaeger , now a CNCF project:

Distributed tracing is quickly becoming a must-have component in the tools that organizations use to monitor their complex, microservice-based architectures. At Uber, our open source distributed tracing system Jaeger saw large-scale internal adoption throughout 2016, integrated into hundreds of microservices and now recording thousands of traces every second.

Here is the story of how we got here, from investigating off-the-shelf solutions like Zipkin, to why we switched from pull to push architecture, and how distributed tracing will continue to evolve:

https://eng.uber.com/distributed-tracing/

(GitHub Pages : https://www.jaegertracing.io/, GitHub: https://github.com/jaegertracing/jaeger)

Bindings/Operator: Python Java Node.js Go C++ Kubernetes JavaScript OpenShift C# Apache Spark

See more
Git logo

Git

289.5K
174K
6.6K
Fast, scalable, distributed revision control system
289.5K
174K
+ 1
6.6K
PROS OF GIT
  • 1.4K
    Distributed version control system
  • 1.1K
    Efficient branching and merging
  • 959
    Fast
  • 845
    Open source
  • 726
    Better than svn
  • 368
    Great command-line application
  • 306
    Simple
  • 291
    Free
  • 232
    Easy to use
  • 222
    Does not require server
  • 27
    Distributed
  • 22
    Small & Fast
  • 18
    Feature based workflow
  • 15
    Staging Area
  • 13
    Most wide-spread VSC
  • 11
    Role-based codelines
  • 11
    Disposable Experimentation
  • 7
    Frictionless Context Switching
  • 6
    Data Assurance
  • 5
    Efficient
  • 4
    Just awesome
  • 3
    Github integration
  • 3
    Easy branching and merging
  • 2
    Compatible
  • 2
    Flexible
  • 2
    Possible to lose history and commits
  • 1
    Rebase supported natively; reflog; access to plumbing
  • 1
    Light
  • 1
    Team Integration
  • 1
    Fast, scalable, distributed revision control system
  • 1
    Easy
  • 1
    Flexible, easy, Safe, and fast
  • 1
    CLI is great, but the GUI tools are awesome
  • 1
    It's what you do
  • 0
    Phinx
CONS OF GIT
  • 16
    Hard to learn
  • 11
    Inconsistent command line interface
  • 9
    Easy to lose uncommitted work
  • 7
    Worst documentation ever possibly made
  • 5
    Awful merge handling
  • 3
    Unexistent preventive security flows
  • 3
    Rebase hell
  • 2
    When --force is disabled, cannot rebase
  • 2
    Ironically even die-hard supporters screw up badly
  • 1
    Doesn't scale for big data

related Git posts

Simon Reymann
Senior Fullstack Developer at QUANTUSflow Software GmbH · | 30 upvotes · 9.2M views

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.
See more
Tymoteusz Paul
Devops guy at X20X Development LTD · | 23 upvotes · 8.2M views

Often enough I have to explain my way of going about setting up a CI/CD pipeline with multiple deployment platforms. Since I am a bit tired of yapping the same every single time, I've decided to write it up and share with the world this way, and send people to read it instead ;). I will explain it on "live-example" of how the Rome got built, basing that current methodology exists only of readme.md and wishes of good luck (as it usually is ;)).

It always starts with an app, whatever it may be and reading the readmes available while Vagrant and VirtualBox is installing and updating. Following that is the first hurdle to go over - convert all the instruction/scripts into Ansible playbook(s), and only stopping when doing a clear vagrant up or vagrant reload we will have a fully working environment. As our Vagrant environment is now functional, it's time to break it! This is the moment to look for how things can be done better (too rigid/too lose versioning? Sloppy environment setup?) and replace them with the right way to do stuff, one that won't bite us in the backside. This is the point, and the best opportunity, to upcycle the existing way of doing dev environment to produce a proper, production-grade product.

I should probably digress here for a moment and explain why. I firmly believe that the way you deploy production is the same way you should deploy develop, shy of few debugging-friendly setting. This way you avoid the discrepancy between how production work vs how development works, which almost always causes major pains in the back of the neck, and with use of proper tools should mean no more work for the developers. That's why we start with Vagrant as developer boxes should be as easy as vagrant up, but the meat of our product lies in Ansible which will do meat of the work and can be applied to almost anything: AWS, bare metal, docker, LXC, in open net, behind vpn - you name it.

We must also give proper consideration to monitoring and logging hoovering at this point. My generic answer here is to grab Elasticsearch, Kibana, and Logstash. While for different use cases there may be better solutions, this one is well battle-tested, performs reasonably and is very easy to scale both vertically (within some limits) and horizontally. Logstash rules are easy to write and are well supported in maintenance through Ansible, which as I've mentioned earlier, are at the very core of things, and creating triggers/reports and alerts based on Elastic and Kibana is generally a breeze, including some quite complex aggregations.

If we are happy with the state of the Ansible it's time to move on and put all those roles and playbooks to work. Namely, we need something to manage our CI/CD pipelines. For me, the choice is obvious: TeamCity. It's modern, robust and unlike most of the light-weight alternatives, it's transparent. What I mean by that is that it doesn't tell you how to do things, doesn't limit your ways to deploy, or test, or package for that matter. Instead, it provides a developer-friendly and rich playground for your pipelines. You can do most the same with Jenkins, but it has a quite dated look and feel to it, while also missing some key functionality that must be brought in via plugins (like quality REST API which comes built-in with TeamCity). It also comes with all the common-handy plugins like Slack or Apache Maven integration.

The exact flow between CI and CD varies too greatly from one application to another to describe, so I will outline a few rules that guide me in it: 1. Make build steps as small as possible. This way when something breaks, we know exactly where, without needing to dig and root around. 2. All security credentials besides development environment must be sources from individual Vault instances. Keys to those containers should exist only on the CI/CD box and accessible by a few people (the less the better). This is pretty self-explanatory, as anything besides dev may contain sensitive data and, at times, be public-facing. Because of that appropriate security must be present. TeamCity shines in this department with excellent secrets-management. 3. Every part of the build chain shall consume and produce artifacts. If it creates nothing, it likely shouldn't be its own build. This way if any issue shows up with any environment or version, all developer has to do it is grab appropriate artifacts to reproduce the issue locally. 4. Deployment builds should be directly tied to specific Git branches/tags. This enables much easier tracking of what caused an issue, including automated identifying and tagging the author (nothing like automated regression testing!).

Speaking of deployments, I generally try to keep it simple but also with a close eye on the wallet. Because of that, I am more than happy with AWS or another cloud provider, but also constantly peeking at the loads and do we get the value of what we are paying for. Often enough the pattern of use is not constantly erratic, but rather has a firm baseline which could be migrated away from the cloud and into bare metal boxes. That is another part where this approach strongly triumphs over the common Docker and CircleCI setup, where you are very much tied in to use cloud providers and getting out is expensive. Here to embrace bare-metal hosting all you need is a help of some container-based self-hosting software, my personal preference is with Proxmox and LXC. Following that all you must write are ansible scripts to manage hardware of Proxmox, similar way as you do for Amazon EC2 (ansible supports both greatly) and you are good to go. One does not exclude another, quite the opposite, as they can live in great synergy and cut your costs dramatically (the heavier your base load, the bigger the savings) while providing production-grade resiliency.

See more
GitHub logo

GitHub

279.2K
243.5K
10.3K
Powerful collaboration, review, and code management for open source and private development projects
279.2K
243.5K
+ 1
10.3K
PROS OF GITHUB
  • 1.8K
    Open source friendly
  • 1.5K
    Easy source control
  • 1.3K
    Nice UI
  • 1.1K
    Great for team collaboration
  • 867
    Easy setup
  • 504
    Issue tracker
  • 486
    Great community
  • 482
    Remote team collaboration
  • 451
    Great way to share
  • 442
    Pull request and features planning
  • 147
    Just works
  • 132
    Integrated in many tools
  • 121
    Free Public Repos
  • 116
    Github Gists
  • 112
    Github pages
  • 83
    Easy to find repos
  • 62
    Open source
  • 60
    It's free
  • 60
    Easy to find projects
  • 56
    Network effect
  • 49
    Extensive API
  • 43
    Organizations
  • 42
    Branching
  • 34
    Developer Profiles
  • 32
    Git Powered Wikis
  • 30
    Great for collaboration
  • 24
    It's fun
  • 23
    Clean interface and good integrations
  • 22
    Community SDK involvement
  • 20
    Learn from others source code
  • 16
    Because: Git
  • 14
    It integrates directly with Azure
  • 10
    Newsfeed
  • 10
    Standard in Open Source collab
  • 8
    Fast
  • 8
    It integrates directly with Hipchat
  • 8
    Beautiful user experience
  • 7
    Easy to discover new code libraries
  • 6
    Smooth integration
  • 6
    Cloud SCM
  • 6
    Nice API
  • 6
    Graphs
  • 6
    Integrations
  • 6
    It's awesome
  • 5
    Quick Onboarding
  • 5
    Remarkable uptime
  • 5
    CI Integration
  • 5
    Hands down best online Git service available
  • 5
    Reliable
  • 4
    Free HTML hosting
  • 4
    Version Control
  • 4
    Simple but powerful
  • 4
    Unlimited Public Repos at no cost
  • 4
    Security options
  • 4
    Loved by developers
  • 4
    Uses GIT
  • 4
    Easy to use and collaborate with others
  • 3
    IAM
  • 3
    Nice to use
  • 3
    Ci
  • 3
    Easy deployment via SSH
  • 2
    Good tools support
  • 2
    Leads the copycats
  • 2
    Free private repos
  • 2
    Free HTML hostings
  • 2
    Easy and efficient maintainance of the projects
  • 2
    Beautiful
  • 2
    Never dethroned
  • 2
    IAM integration
  • 2
    Very Easy to Use
  • 2
    Easy to use
  • 2
    All in one development service
  • 2
    Self Hosted
  • 2
    Issues tracker
  • 2
    Easy source control and everything is backed up
  • 1
    Profound
CONS OF GITHUB
  • 53
    Owned by micrcosoft
  • 37
    Expensive for lone developers that want private repos
  • 15
    Relatively slow product/feature release cadence
  • 10
    API scoping could be better
  • 8
    Only 3 collaborators for private repos
  • 3
    Limited featureset for issue management
  • 2
    GitHub Packages does not support SNAPSHOT versions
  • 2
    Does not have a graph for showing history like git lens
  • 1
    No multilingual interface
  • 1
    Takes a long time to commit
  • 1
    Expensive

related GitHub posts

Johnny Bell

I was building a personal project that I needed to store items in a real time database. I am more comfortable with my Frontend skills than my backend so I didn't want to spend time building out anything in Ruby or Go.

I stumbled on Firebase by #Google, and it was really all I needed. It had realtime data, an area for storing file uploads and best of all for the amount of data I needed it was free!

I built out my application using tools I was familiar with, React for the framework, Redux.js to manage my state across components, and styled-components for the styling.

Now as this was a project I was just working on in my free time for fun I didn't really want to pay for hosting. I did some research and I found Netlify. I had actually seen them at #ReactRally the year before and deployed a Gatsby site to Netlify already.

Netlify was very easy to setup and link to my GitHub account you select a repo and pretty much with very little configuration you have a live site that will deploy every time you push to master.

With the selection of these tools I was able to build out my application, connect it to a realtime database, and deploy to a live environment all with $0 spent.

If you're looking to build out a small app I suggest giving these tools a go as you can get your idea out into the real world for absolutely no cost.

See more
Russel Werner
Lead Engineer at StackShare · | 32 upvotes · 2.1M views

StackShare Feed is built entirely with React, Glamorous, and Apollo. One of our objectives with the public launch of the Feed was to enable a Server-side rendered (SSR) experience for our organic search traffic. When you visit the StackShare Feed, and you aren't logged in, you are delivered the Trending feed experience. We use an in-house Node.js rendering microservice to generate this HTML. This microservice needs to run and serve requests independent of our Rails web app. Up until recently, we had a mono-repo with our Rails and React code living happily together and all served from the same web process. In order to deploy our SSR app into a Heroku environment, we needed to split out our front-end application into a separate repo in GitHub. The driving factor in this decision was mostly due to limitations imposed by Heroku specifically with how processes can't communicate with each other. A new SSR app was created in Heroku and linked directly to the frontend repo so it stays in-sync with changes.

Related to this, we need a way to "deploy" our frontend changes to various server environments without building & releasing the entire Ruby application. We built a hybrid Amazon S3 Amazon CloudFront solution to host our Webpack bundles. A new CircleCI script builds the bundles and uploads them to S3. The final step in our rollout is to update some keys in Redis so our Rails app knows which bundles to serve. The result of these efforts were significant. Our frontend team now moves independently of our backend team, our build & release process takes only a few minutes, we are now using an edge CDN to serve JS assets, and we have pre-rendered React pages!

#StackDecisionsLaunch #SSR #Microservices #FrontEndRepoSplit

See more