Mercurial handles more complex merge cases, too. It is not all that uncommon for two people to edit the exact same lines of a file, and then have to figure out what to do. These cases are called conflicts; figuring out what to do about a conflict is called resolving it.

Прямо сейчас я начинаю верстать новый проект. Я решила, что это хороший повод познакомиться с новой для себя технологией, поэтому выбрала в качестве препроцессора PostCSS. Меня привлекает в нем скорость работы и модульность, однако до сих пор не было случая попробовать его на реальном проекте. Сейчас в основном я использую Sass, и невозможность (хоть и временная) использовать node-sass с шестой версией Node.js, и то, как из-за этого у меня поломались стили в проекте, тоже послужило причиной поиска альтернатив.

Running outside can be tough on your shoes. They'll face the wear and tear of mud puddles, dirt roads and pavement. Some simple maintenance can get out grass stains and scuffs, and keep your shoes looking fresh, even when they're worn. Here is our guide to cleaning and maintaining your trainers.

certainlyakey starred lancedikson/bowser

15-inch MacBook Pro with Touch Bar is my main work tool for more than a year. I use it every single day, all day long — to code, to process photos, and to write my blog posts, of course.

Back in 2017, I thought the Touch Bar had a vast potential to become engaging and helpful. I believed developers might support it in their applications. I was hoping there was a use for it. A year has passed, applications have been updated, but as a Pro user of Pro 15-inch laptop with a 3K Euro price tag, I do declare now — the Touch Bar still remains the useless shit and there is no hope Apple will fix it.

certainlyakey starred jannicz/ng-svg-icon-sprite

In ES6/ES2015, you can import json file in your code.

certainlyakey starred vas3k/btt-touchbar-presets

Atlas is living style-guide, pattern library, guidelines and documentation static site generator with extensive styles monitoring and Sass components reports. It generates documentation from markdown files and documentation comment in scss files.

This article is not intended for seasoned React pros, but rather, those of us who make websites for a living and are curious how React can help us reason about updating user interfaces. I’ve been intrigued by React for some time, and now that it has gained some standing in the community as well as good reviews, the time to learn it seemed justified. There are so many new technologies constantly emerging in front end development that it’s sometimes hard to know if effort into learning something new will pay off. I’ll spend this article going over what I think some of the most valuable practical takeaways are so that you can get started.