6 posts tagged with "ci-cd"

Building robust applications requires more than just a functional database; it requires a disciplined approach to managing changes, testing, and deployment. This guide will focus on the DevOps side of Supabase, explaining how to handle database migrations, integrate with CI/CD pipelines, and manage test data.

Rebasing in Git is a powerful and often misunderstood tool. While its primary use is to integrate changes from one branch onto another, there are several "unusual" yet highly effective ways to leverage git rebase to clean up your commit history, fix mistakes, and collaborate more smoothly.

This guide explores some of these advanced use cases, focusing on their practical application and best practices.

In Git, the terms ours and theirs are used to refer to the two conflicting versions of a file during a merge or rebase. Understanding which version is which is critical for resolving conflicts correctly [1].

Replacing one Git branch with another is a destructive operation that rewrites the history of the target branch. The method you provided using git merge -s ours is a clever and safe way to achieve this without a hard reset. This guide will walk you through the process, explain the commands, and provide a clear, step-by-step example.

Does git rebase affect other branches?

Yes, git rebase can affect other branches, but only if you rebase a branch that other developers have already pulled and started working from. Rebasing a local, unshared branch has no impact on other branches in the repository.

The key to understanding this lies in how rebase works. It rewrites the commit history of a branch by moving its commits to a new base. When you run git rebase, you're essentially creating a new set of commits that replace the original ones.

When defining server URLs in OpenAPI specs, you often need to reference environment-specific values (like staging or production subdomains). But using raw environment variables can result in placeholder values like default: unknown, which may confuse tools like Swagger UI, ReDoc, or code generators.

This guide explains the issue and offers clean solutions - with practical examples.