Function merge

pub fn merge() -> FnOptionArg

Using merging strategies to rebase (default). Note that a rebase merge works by replaying each commit from the working branch on top of the branch. Because of this, when a merge conflict happens, the side reported as ours is the so-far rebased series, starting with , and theirs is the working branch. In other words, the sides are swapped. -m, –merge