semvec/pypi-packages huggingface dataset:
git-rebase-branches 2.0.1
Rebase multiple branches at once
Requires Python: >=3.9

# git-rebase-branches

Rebase multiple branches at once.

***

Say I have a number of feature branches, and new commits are added to `main`:

``` console
dmtucker@localhost:/tmp/tmp.97ZHC4YUiK $ git branch -vv
  feature1 2511789 Add feature #1
  feature2 339ff60 Make fizz do buzz
* feature3 618d195 Improve thing greatly
  main     77bf560 New commits to main!
```

My feature branches are no longer based on `main` and all need to be rebased:

``` console
dmtucker@localhost:/tmp/tmp.97ZHC4YUiK $ git log --graph feature1 feature2 feature3 main
* 618d195 (HEAD -> feature3) Improve thing greatly
| * 339ff60 (feature2) Make fizz do buzz
|/
| * 2511789 (feature1) Add feature #1
|/
| * 77bf560 (main) New commits to main!
|/
* cd9b6c6 Initial commit
```

`git-rebase-branches` can help with that:

``` console
dmtucker@localhost:/tmp/tmp.97ZHC4YUiK $ git-rebase-branches main
$ git for-each-ref --no-contains main '--format=%(refname:short)' refs/heads/
feature1
feature2
feature3
$ git stash push --include-untracked
No local changes to save
$ git log -n1
618d195 (HEAD -> feature3) Improve thing greatly
$ git rebase main feature1
Successfully rebased and updated refs/heads/feature1.
$ git rebase main feature2
Successfully rebased and updated refs/heads/feature2.
$ git rebase main feature3
Successfully rebased and updated refs/heads/feature3.
$ git -c advice.detachedHead=false checkout feature3
Already on 'feature3'

==================================== SUMMARY ====================================
- feature1 (succeeded)
- feature2 (succeeded)
- feature3 (succeeded)
```
- Note: Once you run the first command, `git-rebase-branches` prints and runs the rest.

Now, all feature branches are based on `main`:

``` console
dmtucker@localhost:/tmp/tmp.97ZHC4YUiK $ git log --graph feature1 feature2 feature3 main
* 069fcca (HEAD -> feature3) Improve thing greatly
| * e32b491 (feature1) Add feature #1
|/
| * 8fffd21 (feature2) Make fizz do buzz
|/
* 77bf560 (main) New commits to main!
* cd9b6c6 Initial commit
```
franklin-cli 0.25.149
Terminal client for Jupyter exercises
Requires Python: >=3.9
Keywords: teaching, data, jupyter, docker, git


# Franklin


## Use conventional commits

The Conventional Commits specification is a lightweight convention on top of commit messages. It provides an easy set of rules for creating an explicit commit history; which makes it easier to write automated tools on top of. This convention dovetails with SemVer, by describing the features, fixes, and breaking changes made in commit messages.

The commit message should be structured as follows:

    <type>[optional scope][!]: <description>

    [optional body]

    [[BREAKING CHANGE:] optional footer(s)]

The commit contains the following structural elements, to communicate intent to the consumers of your library:

**fix:** a commit of the type fix patches a bug in your codebase (this correlates with PATCH in Semantic Versioning).

**feat:** a commit of the type feat introduces a new feature to the codebase (this correlates with MINOR in Semantic Versioning).

BREAKING CHANGE: a commit that has a footer **BREAKING CHANGE:**, or appends a ! after the type/scope, introduces a breaking API change (correlating with MAJOR in Semantic Versioning). A BREAKING CHANGE can be part of commits of any type.

Types other than fix: and feat: are allowed, for example @commitlint/config-conventional (based on the Angular convention) recommends **build:**, **chore:**, **ci:**, **docs:**, **style:**, **refactor:**, **perf:**, **test:**, and others.

Footers other than BREAKING CHANGE: <description> may be provided and follow a convention similar to git trailer format.

Additional types are not mandated by the Conventional Commits specification, and have no implicit effect in Semantic Versioning (unless they include a BREAKING CHANGE). A scope may be provided to a commit’s type, to provide additional contextual information and is contained within parenthesis, e.g., feat(parser): add ability to parse arrays.

# Releases

Running `release-tag.sh` creates and pushes a version tag maching the version in the pushed `pyproject.toml`. This triggers Github actions that first amends the remote `CHANGELOG.md` and then builds and publishes a conda package for that version.


# Developer Notes

union of dependencies for franklin, franklin-educator and franklin-admin are included in requirements.txt to make conda package building work

For conda packages, franklin-admin depends on franklin-educator, which depends on franklin. This is to make it possible to install like this or each user group:

students:

    conda install munch-group::franklin

educators:

    conda install munch-group::franklin-educator

admin:

    conda install munch-group::franklin-admin