I recently had a client reach out to me to help her fix merge conflicts on a master branch and she was initially a bit lost in how to fix it properly. The solution is to tweak the git-branching model for better results. It’s a big and old codebase, and
What we do
We’re a software consultancy who specializes in building
best-in-class web applications written with popular frameworks such as Laravel, WordPress, Vue, and React.
Think of us as your team’s Development Department.