Marco Pfatschbacher 76468a9b1b Add checkout --merge-in-base support (#40) ...

* Add checkout --merge-in-base support

When using this option, the checkout will try to merge in the
base branch into each module by running:
`git merge --no-edit origin/<base-branch>`

Retain the unmodified "BaseRevision" info in the Module struct
so it can be used in case it was overwritten by
`applyPullRequestsOverride()`

* only merge base if necessary

* Check if baseRevision is set

Co-authored-by: Bernd Ahlers <bernd@users.noreply.github.com>

---------

Co-authored-by: Bernd Ahlers <bernd@users.noreply.github.com>

2023-12-05 09:53:02 +01:00

..

repo.go

Add checkout --merge-in-base support (#40)

2023-12-05 09:53:02 +01:00