Servage Magazine

Sooner or later every developer working with Git encounters a merge conflict. Especially if you are working with other developers, it’s possible that the code you are working on is changed by someone else at the same time. When that happens, you have to choose whose work you want to keep and what to discard, or perhaps you want to combine them by taking a piece from both versions. Let’s see what tools are available to do this and how the “git mergetool” command works. How Merge Conflicts Happen A merge conflict happens when you edit a file that changes in the remote repository at the same time. When one developer first commits ...

Using a version control system (VCS) is one of the most valuable tools for a developer. If you code every day, you likely use Git or some other VCS daily too, or at least you should. Because Git is a big part of a developer’s daily workflow, it is good to choose your Git client wisely. So, let’s find out what are the pros and cons of some popular Git clients to find out the best one for you. SourceTree SourceTree is one of the most popular Git clients out there. It has a good graph tree feature to track what’s happening inside a project and all of its branches. SourceTree supports all ...

Git is by far the most popular version control system (VCS) at the moment. As a developer, you are most likely already familiar with it, and it is used at your current or future workplace. But Git is not the only choice when it comes to version control. Let’s see what are some considerable alternatives to it. Subversion Subversion (SVN) is probably the first alternative that comes to your mind. It is similar to Git in many ways, but there are major differences too. For example, SVN is a centralized version control system (VCS) while Git is distributed, which means that every developer has a copy of the repository on their local computers. ...

Semantic versioning is a way to specify your application version numbers in a simple and standardized way. There are many versioning schemes available, but semantic versioning is definitely one of the most commonly used ones, and here's why. Major versions In semantic versioning, a version number can look like this: 1.3.18. The first part of the version is the major version. A major version is a version that can introduce backward-incompatible changes to the software. Things that have worked previously, such as API clients, may no longer work with the new version because it has been changed so dramatically. If you use third-party libraries in your own project and notice that the first number ...

Git or an equivalent version control system (VCS) is an essential tool in web development. No matter what VCS you use, it is good to know the basics of Git since it is by far the most popular choice these days. Git is a versatile tool and there are multiple ways, also called workflows, to use it. One popular workflow is the Gitflow workflow, which we will cover in this article. Branches in Gitflow Many Git workflows use one branch to track the history of a project. Most often this is the master branch. In Gitflow there are two branches for this purpose: master and develop. The develop branch contains the latest features ...

Previously we have put more emphasis of presenting source code version control and tools you can use to do that. One the most popular choices today is Git, used for example with the increasingly popular code portal GitHub. However, this is not the only place you can do so, and for example Beanstalk is a real player in the market, which may prove a worthy alternative. They have a somewhat different approach, but the essentials are the same: Version control. The biggest advantages for Beanstalk over GitHub are support for Subversion and Mercurial and a pretty good deployment tool. So, check it out. Setup and manage repositories No server administration necessary. Import or ...

GitTower is an alternative to the SourceTree app we presented recently. It comes with similar features, but may be a better choice for some. It is: Easy. Efficient. Powerful. Git is the future of version control. But using it on the command line can be difficult. Make your life easier with Tower - the most powerful Git client for your Mac. From Beginner to Master Learn Git with Tower. With its easy-to-use interface you'll be up to speed in no time. Tower takes the pain out of Git and makes complex tasks simple. Tower has all of Git's advanced features waiting for you: single line staging, submodule support, file history... Increase your productivity - without ...

Are you a web developer who doesn't like to play system administrator when working on your website? I personally don't like command line stuff, and prefer the look and feel of user interfaces with buttons, menus and things to see and understand, whilst not just executing boring and complex commands. The same goes for using version control. Obviously you can run your checkouts, commits, branches, merges or whatever i a command line, but there are beautiful tools out there which visualize the often complex structure of your versioned source code. Source Tree is a beautiful desktop app for Mac, which allows you to handle your version control with a great ...

If you're a busy web developer, the last thing you want is to struggle with code and project management. Previously we described how version control systems, one them called Git, could help you with that. Today we present GitHub, a place where you can manage your code, using the Git engine, but at the same time getting a whole lot of great tools to help you even more. Manage Teams with Organizations Whether you're running an open source project or a Fortune 500 company, Organizations simplify team management. With teams you can give your developers as much or as little power as they need, from the ability to create projects on ...

Version control aka revision control is a way to make sure you follow the development and changes within your project and files. It is designed to help you understand changes, work on separate features, combine different versions of the same code, or go back and revert to older code if problems occur. All in all, version control is really something you should use to improve your development workflows. Dropbox - the simple choice Dropbox is a file syncing service which automatically syncs all changes you make in files to a central server, and keeps copies of them including change history. Dropbox is not a real version control system like the more professional ...