We have a branch that we need to merge into master/main. However, that branch has been sitting still for the most part of several months and there have been lots of commits into master/main, several ...