Pointers and tips: dispelling the magic of git merge

Published on May 18, 2020 and filed under Software engineering
Written by Zvonimir Spajic and will take

11 minutes

of your time.

In short

Want to see more articles like this in your inbox? You know what to do.

Written by

Zvonimir Spajic

Zvonimir is a passionate software developer from Croatia who worked for madewithlove from 2019 till 2020.

Related articles

.Blogposts___StyledBgImage-sc-1eq0cg3-4.bHeRLV.gbi-844239369-bh8JXvy5SuSLwuf6UytkH7:before { opacity: 1; background-image: url('/static/40beb1aab99a1ab95493c056317f8177/ccfff/blogpost-file-upload.png'); }

Help, I’m creating a file upload

Help, I’m creating a file upload

Bram Devries

May 21, 2021

.Blogposts___StyledBgImage-sc-1eq0cg3-4.bHeRLV.gbi-461139586-p2qvntVB5fbR1w4V5nAj12:before { opacity: 1; background-image: url('/static/889b95a3de898f5a2f6db659397cb94c/d984f/blogpost-testing%401500x.png'); }

Follow these 4 steps to take your debugging skills to the next level

Follow these 4 steps to take your debugging skills to the next level

Bert Ramakers

March 27, 2020

.Blogposts___StyledBgImage-sc-1eq0cg3-4.bHeRLV.gbi-1087174528-gQL5tBtMiNipsnpy8RtVBW:before { opacity: 1; background-image: url('/static/c667981e797739b77f2b0a4e2101d2e2/d984f/What-we-talk-about-when-we-talk-about-testing%401500x.png'); }

What we talk about when we talk about testing

What we talk about when we talk about testing

Zvonimir Spajic

March 26, 2020