Skip to content

Conversation

@SandrineP
Copy link
Collaborator

@SandrineP SandrineP commented Oct 2, 2025

Add merge subcommand (fastforward)

@SandrineP SandrineP force-pushed the merge_sc branch 2 times, most recently from 0b08d8e to 2c7544b Compare October 3, 2025 16:29
@ianthomas23
Copy link
Member

It looks like we need to find a way to run the tests without it picking up the ~/.gitconfig on our dev machines, so that CI and local tests are doing the same thing.

@SandrineP SandrineP changed the title Add merge subcommand Add merge subcommand (fastforward) Oct 28, 2025
@SandrineP SandrineP marked this pull request as ready for review October 28, 2025 13:55
return res ? res : std::string_view{};
}

annotated_commit_list_wrapper::annotated_commit_list_wrapper(std::vector<annotated_commit_wrapper> annotated_commit_list)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that we have multiple whatever_list_wrapper classes there is probably a way we can move the generic vector functionality into a single templated class that we inherit from. But that can be future work.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new list_wrapper is really nice, thanks!

@ianthomas23
Copy link
Member

I think that checkout_subcommand::resolve_local_ref can be removed now that this function is in the repository_wrapper class.

Copy link
Member

@JohanMabille JohanMabille left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Member

@ianthomas23 ianthomas23 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @SandrineP

@ianthomas23 ianthomas23 merged commit 69b86a4 into QuantStack:main Oct 30, 2025
1 check passed
@SandrineP SandrineP deleted the merge_sc branch October 30, 2025 09:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants