website/docs: add tip for recovering from accidental main branch work#19865
Merged
website/docs: add tip for recovering from accidental main branch work#19865
Conversation
Overview: Add a tip to the contributing guide explaining how to recover if you accidentally started making changes on `main` instead of a feature branch. Testing: n/a Motivation: Closes: #18740
✅ Deploy Preview for authentik-integrations ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
✅ Deploy Preview for authentik-docs ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #19865 +/- ##
==========================================
- Coverage 93.26% 93.22% -0.04%
==========================================
Files 968 968
Lines 53331 53331
==========================================
- Hits 49737 49716 -21
- Misses 3594 3615 +21
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
tanberry
approved these changes
Jan 29, 2026
Contributor
tanberry
left a comment
There was a problem hiding this comment.
I'm not sure that we want to document too much about how to use git, but this is a nice tip. And I like being pedantic.
dewi-tik
approved these changes
Jan 29, 2026
Contributor
|
🍒 Cherry-pick to |
Contributor
|
authentik PR Installation instructions Instructions for docker-composeAdd the following block to your AUTHENTIK_IMAGE=ghcr.io/goauthentik/dev-server
AUTHENTIK_TAG=gh-8ae1eba745ee5f6675682e8b07b281e9430034c6
AUTHENTIK_OUTPOSTS__CONTAINER_IMAGE_BASE=ghcr.io/goauthentik/dev-%(type)s:gh-%(build_hash)sAfterwards, run the upgrade commands from the latest release notes. Instructions for KubernetesAdd the following block to your authentik:
outposts:
container_image_base: ghcr.io/goauthentik/dev-%(type)s:gh-%(build_hash)s
global:
image:
repository: ghcr.io/goauthentik/dev-server
tag: gh-8ae1eba745ee5f6675682e8b07b281e9430034c6Afterwards, run the upgrade commands from the latest release notes. |
dominic-r
added a commit
that referenced
this pull request
Jan 29, 2026
… (cherry-pick #19865 to version-2025.12) (#19866) website/docs: add tip for recovering from accidental main branch work (#19865) Overview: Add a tip to the contributing guide explaining how to recover if you accidentally started making changes on `main` instead of a feature branch. Testing: n/a Motivation: Closes: #18740 Co-authored-by: Dominic R <dominic@sdko.org>
kensternberg-authentik
added a commit
that referenced
this pull request
Jan 31, 2026
* main: (52 commits) website: QL Search keyboard interactions docs, examples. (#16259) website/integrations: immich: add signing algorithm (#19187) website/docs: endpoint devices: add version command (#19767) common: introduce common (#19852) web: bump @sentry/browser from 10.37.0 to 10.38.0 in /web in the sentry group across 1 directory (#19871) core: bump debugpy from 1.8.19 to 1.8.20 (#19872) ci: bump actions/cache from 5.0.2 to 5.0.3 (#19873) web: bump chromedriver from 144.0.1 to 145.0.0 in /web (#19874) web: Captcha Refinements, Part 2 (#19757) root: assign cherry-pick PRs to original author (#19858) web: Lit Development Mode, performance fixes. (#19825) web: Fix development theme overrides (#19826) website/docs: add tip for recovering from accidental main branch work (#19865) web: bump API Client version (#19857) rbac: clean up roles and permissions (#19588) web: bump API Client version (#19851) website/docs: add more info to entra id scim doc (#19849) sources/oauth: Fix an issue where wechat may crash duing login. (#18973) providers/scim: fix email validation mismatch (#19848) providers/scim: modify user- and group syncing behavior (#13947) ...
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Overview:
Add a tip to the contributing guide explaining how to recover if you accidentally started making changes on
maininstead of a feature branch.Testing:
n/a
Motivation:
Closes: #18740