On Wed, 4 May 2022, Patrick Sanan wrote: > Unlike most previous docs changes, this has only been done on the main > branch. So, **until PETSc 3.18 is released, make documentation MRs to main**, > unless fixing something particularly critical on the release branch, or > making a change which you've tested won't cause (serious) merge conflicts > when release is merged into main.
This is true for non-doc fixes as-well. [higher probability of merge conflicts and other issues] One way to check for potential (serious) merge conflicts is: - always make the needed change to main branch - once the fix is complete - attempt a rebase onto release git fetch && git rebase --onto origin/release origin/main - If this rebase is clean - then it could be an MR to release [with an easy merge - back to main] Satish