Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

git: Implement Merge function with initial FastForwardMerge support #1044

Merged
merged 2 commits into from
Mar 12, 2024
Merged

git: Implement Merge function with initial FastForwardMerge support #1044

merged 2 commits into from
Mar 12, 2024

Commits on Mar 9, 2024

  1. git: Add Merge with ff-only 

    Add a Merge function that behaves like git merge. This is a first
iteration that only supports --ff-only, which is the simplest type of
merge.
    @pjbgf
    John Cai authored and pjbgf committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    4bed230 View commit details
    Browse the repository at this point in the history

  2. git: Implement Merge function with initial FastForwardMerge support 

    Introduces the Merge function for merging branches in the codebase.
Currently, the function only supports FastForwardMerge strategy, meaning it
can efficiently update the target branch pointer if the source branch history
is a linear descendant.

Support for additional merge strategies (e.g., three-way merge) will be added
in future commits.

Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>
    @pjbgf
    pjbgf committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    3ee5bc9 View commit details
    Browse the repository at this point in the history