Git is a version control system that enables collaboration and code tracking. An important aspect is the use of branches to work on features and fixes. When working on a branch, two key commands are git merge and git rebase. The difference lies in how the history is handled. Merging preserves the history, while rebasing moves local commits on top of the latest remote changes, creating a linear history. Additionally, options like --no-ff and --squash affect how the commit history appears, with --no-ff keeping individual commits and --squash combining them into one.
A practical collection of Git commands for real-world use. Covers working with submodules, rewriting commit history to fix authors, enabling symlinks on Windows, cleaning your working directory, searching commit logs, simulating actions with dry runs, and using git bisect to efficiently track down bugs in your commit history.
Working on TYPO3 projects in a mixed OS environment can be challenging—especially when you're on a Windows PC and your projects are originally configured for macOS. Add in a VPN (often required to access private resources), and you’ve got a perfect storm of compatibility headaches. If this sounds familiar, read on—we’ll walk through key setup tips, common pitfalls, and how to fix them.
Strapi and Next.js make a powerful duo for building modern, content-rich websites. With Strapi’s self-hosted headless CMS and Next.js’s flexibility (SSG, SSR, ISR), you get full control, speed, and scalability—ideal for localized apps, SEO-driven sites, or fast MVPs. In this first part of our walkthrough, we’ll show you how to set up your frontend with TypeScript, Tailwind, and i18n routing, laying the groundwork for a seamless integration with a Strapi backend.