Question: new git model, how do we manage commits?

[Jim Hargrave]

As a concrete example. We currently have dev (maybe we rename this to main) with a large number of commits. We want to release 1.46.1 which cherry picks from dev only those commits that won't break backwards compatibility. Later we want to release 1.47.0 (major release). How do we easily manage all the commits so that we don't forget any or cherry pick the same commit twice?

Jim

[Jim Hargrave]

Are there git tools that help manage this process? Or will we have to keep lists and manually check off the commits we have already merged? The latter seems error prone.

[yves.s...@gmail.com]

There is some info on this here:

https://docs.gitlab.com/ee/user/project/merge_requests/cherry_pick_changes.html

It looks like there are some notes kept with the history.

 

-ys

--
You received this message because you are subscribed to the Google Groups "okapi-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to okapi-devel...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/okapi-devel/568c7d84-d773-49ee-b9db-b6ec4e24211d%40gmail.com.