semvec/pypi-packages huggingface dataset:
git-branch-builder 0.1.8
Utility tool for building Git branches my merging multiple other branches together.
License: BSD license
Keywords: git-branch-builder

==================
git-branch-builder
==================


.. image:: https://img.shields.io/pypi/v/git-branch-builder.svg
        :target: https://pypi.python.org/pypi/git-branch-builder


Utility tool for building Git branches my merging multiple other branches together.


* Free software: BSD license


Documentation
-------------
In some cases it may be desirable to have full control over what code is deployed. This can
be accomplished by creating a YAML configuration file to describe what should be included in your branch.

The format of the file is as follows:

.. code-block:: yaml

    trunk: master
    name: autostaging  # name of the branch to build
    branches:  # list of branches to merge into final branch
      - feature1
      - feature2
      - forkowner:feature3 # branch from fork of repository
    submodules:
      submodules/module1:
        branches:
          - feature1
          - forkowner:feature2 # branch from fork of repository
      submodules/module2:
        trunk: develop
        branches:
          - feature2

To add some safety around this file you should use the `commit-single-file` utility:

.. code-block:: shell

    commit-single-file --push

Building the branch
~~~~~~~~~~~~~~~~~~~
This configuration file can be used to build a deploy branch:

.. code-block:: bash

    git checkout master
    git-branch-builder path/to/branches.yml

Conflict Resolution
~~~~~~~~~~~~~~~~~~~

First, determine where the conflict lies.

a). branch `foo` conflicts with `master`

.. code-block:: shell

    git checkout -b foo origin/foo
    git pull origin master

    # try to resolve conflict

    git push origin foo

b). branch `foo` conflicts with branch `bar`

You can't just merge foo into bar or vice versa, otherwise the PR
for foo will contain commits from bar.  Instead make a third,
conflict-resolution branch:

.. code-block:: shell

    git checkout -b foo+bar --no-track origin/foo
    git pull origin bar

    # try to resolve conflict

    git push origin foo+bar

Now add the branch `foo+bar` to `branches.yml` and move branches foo and
bar to right below it.

Later on branch B gets merged into master and removed from `branches.yml`.

Perhaps the person who removes it also notices the A+B and does the
following. Otherwise anyone who comes along and sees A+B but not both
branches can feel free to assume the following need to be done.

* Merge A+B into A. Since B is now gone, you want to merge the
  resolution into A, otherwise A will conflict with master.

* Remove A+B from `deploy_branches.yml`. It's no longer necessary since it's
  now a subset of A.

If you are unsure of how to resolve a conflict, notify the branch owner.
docker-registry-cleanup 0.1.0
Cleanup images in a docker registry
License: BSD license
Requires Python: >=3.5
Keywords: docker_registry_cleanup

=======================
Docker Registry Cleanup
=======================


.. image:: https://img.shields.io/pypi/v/docker_registry_cleanup.svg
        :target: https://pypi.python.org/pypi/docker_registry_cleanup

.. image:: https://img.shields.io/travis/renefritze/docker_registry_cleanup.svg
        :target: https://travis-ci.com/renefritze/docker_registry_cleanup

.. image:: https://readthedocs.org/projects/docker-registry-cleanup/badge/?version=latest
        :target: https://docker-registry-cleanup.readthedocs.io/en/latest/?badge=latest
        :alt: Documentation Status




Cleanup images in a docker registry


* Free software: BSD license
* Documentation: https://docker-registry-cleanup.readthedocs.io.


Features
--------

* TODO

Credits
-------

This package was created with Cookiecutter_ and the `audreyr/cookiecutter-pypackage`_ project template.

.. _Cookiecutter: https://github.com/audreyr/cookiecutter
.. _`audreyr/cookiecutter-pypackage`: https://github.com/audreyr/cookiecutter-pypackage


=======
History
=======

0.1.0 (2020-09-03)
------------------

* First release on PyPI.