and slightly more advanced option would be to rebase August 20, 2021 by James Palmer instead of merge which will effectively rewind time to the point at which your branch diverged from master Related