Closes#21345Closes#21344
Signed-off-by: Jon Koops <jonkoops@gmail.com>
Co-authored-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Co-authored-by: Mark Franceschelli <mfrances@redhat.com>
Co-authored-by: Hynek Mlnařík <hmlnarik@redhat.com>
Co-authored-by: Agnieszka Gancarczyk <agancarc@redhat.com>
This is an integration commit for the virtual branches that GitButler is tracking.
Due to GitButler managing multiple virtual branches, you cannot switch back and
forth between git branches and virtual branches easily.
If you switch to another branch, GitButler will need to be reinitialized.
If you commit on this branch, GitButler will throw it away.
Here are the branches that are currently applied:
- main (refs/gitbutler/main)
branch head: 512fd32743de60486810c1fb94fa0c4264c2867e
Your previous branch was: HEAD
The sha for that commit was: c30b9545ef
For more information about what we're doing here, check out our docs:
https://docs.gitbutler.com/features/virtual-branches/integration-branch
Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
Co-authored-by: GitButler <gitbutler@gitbutler.com>
* merge all namespaces into one
added fallback namespace to the configuration to minimize
changes to the keys
* small fix
* Fix the broken `OverridesBackend`
* remove stray console log
* restore ns argument
* PR review
* merge main
---------
Co-authored-by: Jon Koops <jonkoops@gmail.com>
