The same split lost them the other way round: the merge base held both changes, each branch had reset the other's files, and the three-way merge kept neither. Both halves of hq ADR 0161 are on main again with this.
The same split lost them the other way round: the merge base held both changes, each branch had reset the other's files, and the three-way merge kept neither. Both halves of hq ADR 0161 are on main again with this.