Merge into an existing Branch, or a guarded head move to a merge result

Abierto
  • ¿Algo no está bien?
#487 1 comentario 0 reacciones 0 asignados Ver en GitHub

Los mantenedores suelen responder en 1 día

Nadie ha tomado este issue todavía.

Evaluación

Dificultad
5/5
Tiempo estimado
Más de una semana
Aptitud para principiantes
15/100
Tipo de issue
Nueva funcionalidad
Claridad
Necesita aclaración
Estado de actividad
Activo
Stack tecnológico
rust
Área
backend

Línea de trabajo

The issue names branch.merge, the Branch head, and the mounted Workspace check as the points involved, and it links #411 for the related cleanup work. Before any code, the maintainers need to choose between merging into an existing Branch and a guarded head move, and that decision is not made in the issue. Done means that choice is recorded and the refusal behaviour for a mounted Workspace is specified as a typed error.

Escrito por el modelo de indexación a partir del texto del issue.

Descripción

new feature question

DISCLOSURE: This submission was generated by AI under the approval of the human who owns the github account. If it is unwelcome due to the use of AI or there is any feedback, please comment. Any human comment will receive a human response where applicable. This submission is intended to enhance the project, not frustrate maintainers. Thank you for making your project available open source!

Summary

When work has diverged, branch.merge produces its result on a new Branch. A caller that wants the result on a Branch it already uses has no way to move that Branch's head to the merge result.

Proposal

A merge into an existing Branch, or a guarded head move to a merge result. It would be refused while that Branch has a mounted Workspace, unless the caller explicitly opts in, and the refusal would be typed.

What it enables

  • Long-lived Branch names that keep their identity across merges, as in other version-control systems.
  • No growth in the number of Branches created only to hold merge results, which today also need to be cleaned up (see #411).
  • Workspaces and tools bound to a Branch name keep working after a merge, without being re-pointed to a new Branch.

Notes

Observed on v1.1.0 (ad78914).

Lenguaje dominante
Rust
Estrellas
2.1k
Forks
110
Merge medio
23 h 52 min
PR fusionados (30 d)
138

Preparar el entorno

Este proyecto no incluye contenedor de desarrollo, Dockerfile ni guía de contribución, así que la configuración corre por tu cuenta: empieza por su README y consulta nuestra guía para la primera contribución para los pasos generales.

Primeros pasos

  1. Lee el issue completo y luego la guía de contribución del proyecto.
  2. Comenta en el issue que vas a ocuparte — evita que dos personas hagan lo mismo.
  3. Haz un fork del repositorio y trabaja en una rama.
  4. Abre un pull request que haga referencia al número del issue.

Más de Ephemeral-AI-Lab/layerfs

Todos los issues de Ephemeral-AI-Lab/layerfs

Issues similares

Más issues de Rust

Recibe los nuevos issues en tu correo

Un resumen breve de issues de GitHub para principiantes.