Raymon Schouwenaar

Prevent git merge-conflicts by tabs or spaces with Editorconfig ๐Ÿ˜‰

Written by Raymon on , time to read ~1 minutes.

If you ever worked in a team with developers, you soon find out they maybe use different editors, (IDEโ€™s) with different settings than yours.

But you are a big fan of linting and reviewing code in Github or other Git system, but everytime someone checks-in code, there are massive merge-conflicts because of different settings for the indenting.

If you use tabs and a developer from your team is using spaces by default, it will soon become a merge-conflict hell!

But of course, there is a very quick fix for it!

Editorconfig

The editorconfig is supported across multiple editors and platforms.

By putting this file in your project, most editors will change the config by default.

There is a great introduction playlist on youtube you should definitely watch if you want to see how it works.

comments powered by Disqus

Readmore

CSS Grid Layout Metro design blocks

The times have come that we don’t have to fiddle around with Floats and Tables anymore! Flexbox is already an established term in the industry of Frontend Developers.

3 ways to loop over Object properties with Vanilla JavaScript

It happens a lot that you need to loop over an Array with JavaScript Objects! But sometimes you just donโ€™t know what kind of properties that Object has. Lucky we are that JavaScript offers a few ways of looping over JavaScript Object properties.