Dave Pollot: Bringing New Life to Old Art

Original Source: http://feedproxy.google.com/~r/abduzeedo/~3/-DLxd9hloXg/dave-pollot-bringing-new-life-old-art

Dave Pollot: Bringing New Life to Old Art
Dave Pollot: Bringing New Life to Old Art

ibbyMar 19, 2020

As we’re all living in a current reality that feels more like a fictional book or movie we’re doing our best to share content that we hope will help uplift spirits, if even for a brief moment. We’re amongst those sheltering in place here in the Bay Area and concurrently I’ve been researching more good news to share with our readers. Thanks to my friend Erica over at HonestlyWTF I came across the work of a unique artistic talent named Dave Pollot, a former software engineer bringing new life to old art. Dave finds inspiration by way of unwanted thrift shop art, bringing a whole new meaning to the piece oftentimes influenced by pop culture or current events. For example, Dave uses popular food items inserted into still life paintings to represent the distractions (both mental and material) that prevent us from being present and focused on where we are and what we’re doing. Please enjoy just a smattering of this creative talent’s work here.

“Painting has always been something of a hobby to me, but it wasn’t until I started repurposing thrift art in 2012 that I did it with any real consistency.  The idea actually began as a joke between my wife (who loves to shop at thrift stores) and I, but it quickly evolved into an attempt to answer a question: Could I take a piece of unwanted art, and without changing its aesthetic, change its meaning by painting into it some bit of pop culture/nostalgia and make it desirable in the modern world?

About Dave Pollot 

Dave Pollot is a New York based artist who is known for his altered thrift art paintings.  He finds unwanted artwork and adds his own touch – most often pop culture parodies – and in doing so, bridges the divide between classic and pop art.

His artwork has been displayed and found homes in galleries, businesses, and private collections in all 50 states and in over 40 countries around the globe.  His work has attracted attention from the media both in the U.S. and abroad, including Business Insider, Instagram, and the SyFy Channel, and his corporate clients include SONY, Instagram, and Troegs Brewing Company among others.   When he’s not painting, he can be found spending time with his wife and two dogs.

Cyber crime is on the rise: how can you protect your business?

Original Source: http://feedproxy.google.com/~r/Designrfix/~3/qavNuIqiqaA/cyber-crime-is-on-the-rise-how-can-you-protect-your-business

Free image taken from https://unsplash.com/photos/y-wjLDbPNGM  Statistically, 70% of senior business managers rate cybersecurity as a high priority but only 30% have a solid cybersecurity policy in place and most businesses invest less than $500/year in security products. If you’re worried that your business is vulnerable, the time to act is now because the numbers don’t […]

The post Cyber crime is on the rise: how can you protect your business? appeared first on designrfix.com.

Enhance Your Business with a Professional Website

Original Source: http://feedproxy.google.com/~r/Designrfix/~3/dn4PUMDXhs0/enhance-your-business-with-a-professional-website

In this world of social and online media significance, it is a must for organizations to have an online presence to be noticed and taken seriously  by potential clients. Despite the significance of an online presence, shockingly, a huge number of independent ventures are yet to get on the web. They are passing up a […]

The post Enhance Your Business with a Professional Website appeared first on designrfix.com.

Creative Sound Design For Music

Original Source: http://feedproxy.google.com/~r/Designrfix/~3/3V_T9rXx0Sc/creative-sound-design-for-music

Important points in sound design Sounds surround us everywhere: everyday business, film, television or radio broadcasting. Sound is one of the most important parts of our perception of the environment, our picture of the world. Sound is an integral part of any movie, promotional video, presentation or clip. Dialogues, specially selected music background, sound effects, […]

The post Creative Sound Design For Music appeared first on designrfix.com.

Incredible Game Level Design for Ori and the Will of the Wisps

Original Source: http://feedproxy.google.com/~r/abduzeedo/~3/Yud08D3cBHs/incredible-game-level-design-ori-and-will-wisps

Incredible Game Level Design for Ori and the Will of the Wisps
Incredible Game Level Design for Ori and the Will of the Wisps

abduzeedoMar 17, 2020

I have been playing more video-games since the self-quarantine started here in California. I’ve always been a fan of games and game level design. One game that excels at that for me is Ori and the Blind Forest, which was originally launched for the Xbox in 2015 but I’ve been playing it on the Switch. Microsoft Studios launched the sequel last week, Ori and the Will of the Wisps and it’s quite beautiful. Lina Kit was really kind to share a bit more of the level designs she created for the game. Check them out

Game Design

Image may contain: screenshot and darkImage may contain: screenshot, cartoon and caveImage may contain: cave, screenshot and darkImage may contain: screenshot, outdoor and snowImage may contain: screenshot, cartoon and sceneImage may contain: aquarium, reef and snowImage may contain: nature, cave and screenshotImage may contain: fire, building and indoorImage may contain: nature, fire and darkImage may contain: scene, person and darkImage may contain: cartoon and screenshot

Collective #597

Original Source: http://feedproxy.google.com/~r/tympanus/~3/rdTaAKseg7M/

Creative Coding Essentials

The Alpha-version of Tim Rodenbröker’s course “Creative Coding Essentials”, teaching you the very basics of Creative Coding.

Check it out


This content is sponsored via Syndicate Ads
Grow with the
All-in-One Marketing Platform

Your app is up and running! Now what? Seamlessly connect it to your marketing data. That’s what.

Learn more

Accessible SVGs: Inclusiveness Beyond Patterns

Carie Fisher explores the question “if true inclusiveness lies beyond patterns — what other factors should we consider when designing and developing accessible SVGs?”

Read it

The CSS Podcast

Una Kravets and Adam Argyle break down complex aspects of CSS into digestible episodes covering everything from accessibility to z-index.

Check it out

How to create an accordion hover effect with box-shadows

A step-by-step tutorial on how to create a rainbow accordion animation in CSS, using only box-shadows. By Sarah L. Fossheim.

Read it

Sketch Dark Mode Plugin

Generate a dark mode version of any Sketch document, the right way.

Check it out


A beautiful monospace font family designed for software developers.

Check it out

CSS Viewport Units

A thorough and practical guide to CSS viewport units by Ahmad Shadeed.

Check it out


An opinionated framework that combines React, GraphQL, Prisma2, SQL, and lots more out of the box.

Check it out

The History of the URL

Zack Bloom from Cloudflare dives into the history of the URL.

Read it

16 Things to Improve Your Website Accessibility (Checklist)

In this article Bruce Lawson explains how to improve website accessibility.

Check it out

Ping Pong Mini-Game

A great mini-game made with react-three-fiber ofc, use-cannon and zustand. By Paul Henschel.

Check it out

Photo Stream

Self-hosted, super simple photo stream. By Tim Van Damme.

Check it out

Deep Learning Algorithms – The Complete Guide

Learn about all the essential Deep Learning algorithms including models used in Computer Vision and Natural Language Processing.

Check it out

Aliasing in computer graphics

A fascinating read on the manifestations of aliasing in 3D graphics including an attempt to theoretically unify them.

Read it

CSS Mondrian

Piet Mondrian style art using CSS grid made by Adam Fuhrer.

Check it out

Flexbox and absolute positioning

A mini-post about Flexbox and absolute positioning, and a minor bug in the Firefox DevTools.

Read it


Create your personal workspace to keep everything organized with boards.

Check it out

Virtual Doom

In case you didn’t know about it: Virtual DOOM is a first-person 3D demo that uses the DOM as its render engine, no WebGL, canvas or SVG.

Check it out


Remove the background of any video with this online tool.

Check it out

Flip Counter Plugin

An advanced flip counter plugin that is easy to setup.

Check it out

Collective #597 was written by Pedro Botelho and published on Codrops.

Stay Calm And Read Smashing

Original Source: https://www.smashingmagazine.com/2020/03/monthly-roundup-03-2020/

Stay Calm And Read Smashing

Stay Calm And Read Smashing

Iris Lješnjanin


For all the times we asked folks about Smashing, most still seem to believe that we’re some sort of large publishing company situated somewhere in the United States — both of which are wrong. It all started in Freiburg, Germany, and the team consists of folks scattered all over the world — with most of us not working fulltime for Smashing.

That’s right, working remotely is quite familiar to us, and so with the current situation going on with COVID-19 that is making everyone uneasy, we’d like to make the best of things and help our friends who are having to work or lead teams remotely for the first time. Our editor-in-chief, Rachel Andrew, has prepared a nice post to help you stay connected and keep learning while we go through this together.

You may have already heard that SmashingConf SF has been postponed to November due to the unfortunate travel restrictions and many other reasons. It was truly a difficult decision for the team to make, but we believe it is the best way forward — safety and health always come first.

Without further ado, here’s a short update of things going on at Smashing and some super creative work shared from and to the community!

Happy reading — from my computer to yours!

Designing With Ethics In Mind

...After months of hard work, the “The Ethical Design Handbook” is finally here — and it’s shipping! The response has already been overwhelmingly positive, and we’re excited to share reviews with you soon. There is still quite a bit of work to do on the web, but our hope is that with this book, you will be equipped with enough tooling to slowly move a company towards a more sustainable and healthy digital footprint!

Of course, you can jump to the table of contents right away, or download a free PDF excerpt to get a first impression of the book — we’re sure you won’t be disappointed! Read our official release post with all the details →

Always Learning New Things From One Another

Smashing PodcastWe all have busy schedules, but there’s always time to pop in those earplugs and listen to some music or podcasts that make you happy! We’re moving on to our 12th episode of the Smashing Podcast — with folks from different backgrounds and so much to share! You’re always welcome to tune in and share your questions and thoughts with us anytime!

Previous Smashing Podcast episodes (including transcripts)
Follow @SmashingPod on Twitter

Apart from the heart-breaking news about our postponed SmashingConf SF, our SmashingConfs are known to be friendly, inclusive events where front-end developers and designers come together to attend live sessions and hands-on workshops. From live designing to live debugging, all of our speakers like to go into detail and show useful examples from their own projects on the big screen.

Here are some talks you may like to watch and learn from:

Talk Title
Speaker’s Name

Thinking With Grids
Jen Simmons

Building Accessible Interfaces: Patterns And Techniques
Sara Soueidan

Dynamic CSS
Miriam Suzanne

Dynamic Web Typography
Jason Pamental

Making A Difference With Differential Serving
Jeremy Wagner

Slam Dunk Your Javascript Fundamentals
Wes Bos

Think Like An Email Geek
Rémi Parmentier

Effortless Performance Debugging
Anna Migas

Move Fast & Don’t Break Things
Scott Jehl

Designer vs Developer!
Dan Mall, Brad Frost and Ian Frost

The first SmashingConf took place in Freiburg back in 2012, so there are so many more talks you can watch. See all SmashingConf videos →

Shining The Spotlight On React, Redux And Electron

Advent calendarsMark your calendars! Next week on March 19, we’ll be hosting a Smashing TV webinar with Cassidy Williams who’ll be explaining how to organize a modern React application and build an Electron application (with React). Join us at 17:00 London time — we’d love to hear your thoughts and experiences you’ve had with React in your projects!

Smashing TV is a series of webinars and live streams packed with practical tips for designers and developers. They’re not just talks, but more like conversations and “here-is-how-I-work”-sessions. Smashing Members can download recordings, and also receive discounts and lots of goodies to make their membership worthwhile. Tell me more →

Trending Topics On SmashingMag

We publish a new article every day on various topics that are current in the web industry. Here are some that our readers seemed to enjoy the most and have recommended further:

“Why Are We Talking About CSS4?”
by Rachel Andrew
Around the web and within the CSS Working Group, there has been some discussion about whether we should specify a version of CSS — perhaps naming it CSS4. In this article, Rachel Andrew rounds up some of the pros and cons of doing so, and asks for your feedback on the suggestion.
“Setting Height And Width On Images Is Important Again”
by Barry Pollard
Thanks to some recent changes in browsers, it’s now well worth setting width and height attributes on your images to prevent layout shifts and improve the experience of your site visitors.
“Setting Up Tailwind CSS In A React Project”
by Blessing Krofegha
This article introduces Tailwind CSS, a CSS library that gives you all of the building blocks you need to build bespoke designs without opinionated styles. You’ll also learn how to seamlessly set up Tailwind CSS in a React project.
“Introducing Alpine.js: A Tiny JavaScript Framework”
by Phil Smith
Ever built a website and reached for jQuery, Bootstrap, Vue.js or React to acheive some basic user interaction? Alpine.js is a fraction of the size of these frameworks because it involves no build steps and provides all of the tools you need to build a basic user interface.
“How To Design Mobile Apps For One-Hand Usage”
by Maitrik Kataria
90% of the smartphones sold today have >5-inch displays. Bigger screen real estate presents newer challenges and opportunities for app makers and designers. Let’s look at how designing apps for one-handed usage can solve those challenges.

Best Picks From Our Newsletter

We’ll be honest: Every second week, we struggle with keeping the Smashing Newsletter issues at a moderate length — there are just so many talented folks out there working on brilliant projects! So, without wanting to make this monthly update too long either, we’re shining the spotlight on the following projects:

P.S.: A huge thank you to Cosima Mielke for writing and preparing these posts!

Find And Fix Errors In Your Designs

We all know those moments when we are so immersed in a project that we lose the distance we need to be able to catch little inconsistencies: an incorrect border-radius around an image or missing styles or text, for example. If you’re designing in Figma, the free and open-source plugin Design Lint makes finding and fixing errors like these easy so that no bug makes it into production.

Design LintA free and open-source plugin for Figma built to help you find and fix errors in your designs.: Design Lint.

Design Lint checks for missing text, fill, stroke, and effects styles, and catches incorrect border-radius values on all your layers. To not interrupt your workflow, the plugin automatically updates as you fix errors. The repo is available on GitHub, so feel free to write specific rules to tailor the plugin to your needs.

Learn CSS Positioning With… Cats!

Could there be a better way to learn CSS positioning as with a bunch of friendly cats? That’s probably what Ahmad Shadeed thought, too, when he created his interactive guide to how CSS positioning works.

Learn CSS Positioning

Meow! Ahmad Shadeed has prepared a great guide for you to learn everything about CSS positioning!

The guide teaches you to use CSS to position three cartoon cats and their blanket inside a box, and once you’ve grasped the concept, you can start tinkering with the interactive demo that visualizes how the result changes as you edit the values. Now who said learning can’t be fun?

Intimacy, An Interactive Short Poem

An inspiring experiment comes from the French graphic and interaction design student Thibaud Giffon: “Intimacy”. The interactive short poem uses abstract images, sound, and text to explore intimacy from different angles.


The “Mixed Up” musical poem is brought to life (sound ON) by just moving your cursor across the cords. Try it out!

Compassion, distance, confusion, touch — these are four of the eight chapters that make up the poem; and each one of them reflects the topic in its own, unique way: with warm and harmonious waves or circles that melt into each other but also with dissonant strings or colorful bubbles that burst as they make space for themselves. Beautiful!

All Your SVG Icons In One Place

Having one central place to organize all your assets is always a good thing, not only for teams — to keep track of what you have and to quickly find what you’re looking for. The free cross-platform app Iconset is such a place: it helps you collect, customize, share, and manage all your SVG icon sets.


Organizing SVG icons all in one place with Iconset.

To make it easier to find the icon you’re looking for, you can organize your icons in sets or with tags, and, once you’ve found the icon you need, you can drag it directly into your favorite tool. A real timesaver. Iconset supports cloud services like Dropbox or OneDrive so that all your icons are always in sync between team members. The app is available for Mac and Windows.

An Ancient Hero’s WebGL Adventure

A reluctant hero on a quest he never asked for — that’s the story behind the browser-based adventure video game Heraclos. Set in ancient Greece, the young Heraclos stumbles across an amphora that belongs to one of the gods. He is declared to be the chosen one and gets sent off to climb the secret mountain and return the amphora to his owner.


Heraclos, an adventure video game made in WebGL.

What makes the game so noteworthy is the fun twist in the interaction between the hero and the god (a parody of common heroic stories) but also the technical background: Heraclos was designed in only three months by a group of students at the Gobelins school of images in Paris — with WebGL and Cannon.js. A great example of what’s possible on the web.

An Open-Source Screen Recorder Built With Web Technology

Have you heard of Kap, yet? The open-source screen recorder is one that is definitely worth checking out if you’re frequently doing screen recordings.


Kap, an open-source screen recorder built with web technology.

Built with web technologies, Kap produces high-quality recordings in GIF, MP4, WebM, or APNG formats. You can include audio (even from your microphone), highlight clicks, and trim the recordings. As a bonus goodie, there are also options to share your recorded GIFs on Giphy, deploy them with ZEIT now, or upload them to Streamable. Perfect for technical demos.

Open Peeps, A Free Hand-Drawn Illustration Library

584,688 possible combinations. That’s the number of different characters you could create with Pablo Stanley’s hand-drawn illustration library Open Peeps.

Open Peeps

“Open Peeps,” a hand-drawn illustration library created by Pablo Stanley.

Open Peeps lets you mix and match different vector elements to create diverse personalities: combine clothing and hairstyles, change emotion with facial expressions, set the scene with different poses — the possibilities are sheer endless. And if you’re in a hurry, Pablo also prepared some ready-to-download Peeps that you can use right away. Open Peeps is released under a CC0 license, so you are free to use the illustrations in both personal and commercial projects. A great way to add a handmade touch to your design.

How To Make Inputs More Accessible

In 2019, WebAim analyzed the accessibility of the top one million websites, with a shocking conclusion: the percentage of error-free pages was estimated to be under one percent. To make our sites inclusive and usable for people who rely on assistive technology, we need to get the basics of semantic HTML right. With its credo of starting small, sharing, and working together, Oscar Braunert’s article on inclusive inputs is a great starting point to do so.

Starting off with the basics of WAI, ARIA, and WCAG, the article explores how to make inputs more accessible. The tips can be implemented without changing the user interface, and, as Oscar puts it: “If in doubt, just do it. Nobody will notice. Except some of your users. And they will thank you for it.”

An Open-Source Font For Developers

High readability, quick text scanning, no distraction — these are just some of the demands developers have on a typeface. Well, the free and open-source typeface JetBrains Mono meets all of them beautifully.

JetBrains Mono

JetBrains Mono’s typeface forms are simple and free from unnecessary details. Rendered in small sizes, the text looks crisper.

To do so, Jet Brains Mono takes advantage of some small but mighty details: Compared to other monospace fonts, the height of JetBrains Mono is increased while the characters remain standard in width to keep code lines to the length developers expect. To improve readability even further, 138 code-specific ligatures reduce noise so that your eyes need to process less and whitespace becomes more balanced. Clever! JetBrains Mono comes in four weights and supports 145 languages.

The Ultimate Guide To iframes

With a lot of articles advising against them, iframes don’t have the best reputation. JavaScript developer Nada Rifki sees things differently: She suggests not to let their reputation prevent you from relying on iframes. After all, they have many legitimate use cases.

The Ultimate Guide To iframes

The ultimate guide to iframes written by Nada Rifki.

To help you form your own opinion on this controversial element, Nada wrote an ultimate guide to iframes which explores iframe features and how to use them; tricky situations where iframes might come in handy; last but not least, how you can secure your iframe against potential vulnerabilities. A great opportunity to see things from a different perspective.

A Guide To Console Commands

The capabilities of the developer’s debugging console have evolved significantly in the past years — from a means to report errors to automatically logging information like network requests and security errors or warnings. There’s also a way for a website’s JavaScript to trigger various commands that output to the console for debugging purposes. And while these features are mostly consistent between browsers, there are also some functional differences.

A Guide To Console Commands

“A Guide to Console Commands” by Travis Almand

If you’re looking for an overview of what console commands are capable of, Travis Almand put together a helpful guide. It covers Firefox and Chrome and examines various commands that can be used in the browser’s console output or with JavaScript. A handy summary.

A postcat. Sign up for our Smashing Newsletter.

Smashing Newsletter

Upgrade your inbox and get our editors’ picks 2× a month — delivered right into your inbox. Earlier issues.

Your (smashing) email

Subscribe →

Useful tips for web designers. Sent 2× a month.
You can unsubscribe any time — obviously.

Smashing Editorial
(cm, vf, ra, il)

Background Scale Hover Effect with CSS Clip-path

Original Source: http://feedproxy.google.com/~r/tympanus/~3/lgXAHT2MtbI/

Today I’d like to share a simple hover effect with you. It’s a recreation of the hover effect seen in the menu on the DDD Hotel website by Garden Eight. The idea is to scale down the background image and “fitting” it to a clip shape which contains the same background image. The shape is visible because the opacity of the background is a bit lower:

When I saw the effect on the DDD Hotel website, I wanted to try to do it using the clip-path property and explore different shapes.

It’s very straightforward: one layer has the background image and a second layer has the additional clip path with a basic shape.

For the last demo, where I wanted to show two circles, I simply stacked two clip-path layers. But for more complex paths, one could also use an SVG instead.

Other interesting things that could be done here is to animate the clip-path (scale it/move it) or change the shape for each link. What do you think?

Background Scale Hover Effect with CSS Clip-path was written by Mary Lou and published on Codrops.

10 Git Techniques You Need to Know Before You Join a Team

Original Source: https://www.sitepoint.com/git-techniques-to-know-before-you-join-a-team/?utm_source=rss

Have you been using Git for some time but never in a team environment? Are you familiar with the basics of Git but unsure how large teams use Git at work?

In this post, I’ll talk about the basic Git techniques that you must be familiar with before you join a team. I’ve listed them in an order that you’d logically follow to contribute to a repository, as the importance of each step is paramount. Let’s now jump into the list.

1. Cloning: Getting Started in a Team

If you’ve used Git for personal projects, you may only have initialized a project from scratch and added to it over time. When you’re working on an existing codebase, the first step is to clone the codebase into your local system. This enables you to work on your copy of the repository without any interference from other changes.

To clone a repository, run the git clone command, followed by the path to the repository:

git clone /path/to/repo

If your source doesn’t reside in the same system, you can SSH to a remote system and clone too:

git clone username@remote_system_ip:/path/to/repo/on/remote

If you’re cloning from a source on the Internet, you can simply add the URL:

git clone https://github.com/sdaityari/my_git_project.git

Whenever you’re cloning a repository, you’ve the choice of multiple protocols to connect to the source. In the GitHub example above, I’ve used the https protocol.

2. Managing Remotes in Git

Once you’ve cloned your repository, it still maintains a pointer to the source. This pointer is an example of a remote in Git. A remote is a pointer to another copy of the same repository. When you clone a repository, a pointer origin is automatically created which points to the source.

You can check a list of remotes in a repository by running the following command:

git remove -v

To add a remote, you can use the git remote add command:

git remote add remote_name remote_address

You can remove a remote using the git remote remove command:

git remote remove remote_name

If you’d like to change the address of a remote, you can use the set-url command:

git remote set-url remote_name new_remote_address

3. Branching in Git

The biggest advantage of Git over other version control systems is the power of its branches. Before I jump into the essentials of branching, you may be wondering what a branch is. A branch is a pointer to a commit in your repository, which in turn points to its predecessor. Therefore, a branch represents a list of commits in chronological order. When you create a branch, you effectively create only a new pointer to a commit. However, in essence, it represents a new, independent path of development.

If you’ve been working on your own project, you may never have consciously used branches. By default, Git uses the master branch for development. Any new commits are added to this branch.

Branching is necessary for Git to bifurcate lines of work in a project. At a single time, there may be many developers who are working on a variety of different problems. Ideally, these problems are worked on in different branches to ensure logical separation of new code until code review and merge.

To check a list of branches and the current active branch, run the following command:

git branch

To create a new branch, run the following command:

git branch new_branch

Even though Git creates a new branch, notice that your active branch is still the old one. To start development in a new branch, run the following:

git checkout new_branch

To create a new branch and change the active branch, run the following command:

git checkout -b new_branch

To rename the current branch, run the following command:

git branch -m new_renamed_branch

Use the -D option to remove a branch:

git branch -D new_renamed_branch

Here’s a detailed guide on branching in Git.

4. Update your Local Repository: Merging

While we’ve checked the basics of branching in Git, the next logical step is to merge a branch into your base branch when you’ve finished working on a problem. To merge a branch, run the following command:

git checkout base_branch
git merge new_branch

While it may sound like an easy process, merging is potentially the most time-consuming process in Git, as it can give rise to conflicts.

5. Handle Conflicts

Imagine that you’re working on a file in a new branch. After you commit the changes, you request Git to merge your new branch with your base branch. However, the same part of the same file in the base branch has been updated since you created the new branch. How does Git decide which changes to keep and which changes to discard?

Git always tries to not lose any data in the process of a merge. If the changes to the same file were done in different parts of the file, you could get away by keeping both sets of changes. However, if Git is unable to decide which changes to keep, it raises a conflict.

When a conflict has been raised, running git status on your repository shows a list of files that were modified in both branches being merged. If you open any file with a conflict, you’d notice the following set of lines:

<<<<<<<< HEAD


>>>>>>>> new_branch

The part of the file between <<<<<<<< HEAD and ======== contains that code which is present in the base branch. The lines of code between ======== and >>>>>>>> new_branch are present in the new_branch branch. The developer who’s merging the code has the responsibility to decide what part of the code (or a mix of both parts) should be included in the merge. Once edited, remove the three sets of lines shown, save the file, and commit the changes.

The post 10 Git Techniques You Need to Know Before You Join a Team appeared first on SitePoint.

10 Genius Interior Design Apps

Original Source: http://feedproxy.google.com/~r/Designrfix/~3/z2Ma-1F4XqM/10-genius-interior-design-apps

The development of technology greatly simplifies the life of a person both in everyday affairs and in professional activities. Nowadays, architects have stopped using paper, pencils and a ruler to create a plan. This process has become much easier, more fun and more productive. All this became possible thanks to special design apps and programs. […]

The post 10 Genius Interior Design Apps appeared first on designrfix.com.