search

openSUSE / openSUSE-git

3 stars 5 forks source link

consider one hidden branch instead of many #6

Open JanZerebecki opened 2 years ago

JanZerebecki commented 2 years ago

Merge the rebased branch into the previous HEAD with strategy recursive-theirs, use this to build from.

aplanas commented 2 years ago

What if the rebase has conflicts that needs to be manually resolved?

The problem (IMHO) is that a conflict is not an indication of an issue. I the main branch I can rebase at will, drop released commits, and do crazy stuff (in principle / technically, not by policy). The build system guarantee is that any released (or build) RPM should be recreated, and all the history should be preserved.

JanZerebecki commented 1 year ago

I think this was already discussed during a meeting, but for completeness:

Correction, not merge strategy recursive with option theirs, as that will only resolve conflicts in favor of their change while otherwise taking from both sides, but instead: Switch to the rebased branch and then merge the previous head into it with merge strategy ours and use this as the one hidden branch. This will result in a tree that is exactly the same as the rebased branch, but with history from both.