Integrated: vcs: support explicit fast-forward merging
ehelin at openjdk.java.net
Sat Aug 22 10:00:57 UTC 2020
On Sat, 22 Aug 2020 09:25:16 GMT, Erik Helin <ehelin at openjdk.org> wrote:
> Hi all,
> please review this patch that makes it explicit for `Repository.merge` whether a fast-forward merge should be attempted
> or not.
> - [x] `make test` passes on Linux x64
> - [x] Added two new unit tests
This pull request has now been integrated.
Author: Erik Helin <ehelin at openjdk.org>
Stats: 122 lines in 5 files changed: 0 ins; 100 del; 22 mod
vcs: support explicit fast-forward merging
More information about the skara-dev