On Wed, Jun 24, 2020 at 08:06:08PM +0200, Andrea Bolognani wrote:
On Wed, 2020-06-24 at 17:20 +0100, Daniel P. Berrangé wrote:
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> new file mode 100644
> index 0000000..75d34c3
> --- /dev/null
> +++ b/.gitlab-ci.yml
Oh and this doesn't apply cleanly on top of master, because you're
trying to create a new file while .gitlab-ci.yml already exists. I
think you made this commit on top of master^ instead of master.
Yeah, didn't realize my fork was outdated
Regards,
Daniel
--
|:
https://berrange.com -o-
https://www.flickr.com/photos/dberrange :|
|:
https://libvirt.org -o-
https://fstop138.berrange.com :|
|:
https://entangle-photo.org -o-
https://www.instagram.com/dberrange :|