Merging kcalutils release/20.04 onto master

[Matthew Dawson]

On Thursday, May 28, 2020 1:01:55 P.M. EDT Glen Ditchfield wrote:
> I think I've made a mess.   Yesterday I created merge request
> !4 while exploring but I did not merge it.  Just now I found a problem with
> ~/.gitconfig, fixed it, and did a push to master, but somehow !4 got merged
> as well.  I don't know how that happened.
> 
> The repository graph on Gitlab is a tangle, and I think Laurent's last
> commit was overwritten.
> 
> Should I (or someone with experience!) revert !4?
Hi Glen,

Gitlab will automatically set a MR as merged if you manually merge the changes 
into the destination branch.  Since you manually pushed the merge, Gitlab 
noticed and marked the MR as merged.

I double checked on my local Gitlab, and I saw the same behaviour.

-- 
Matthew
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kde-pim/attachments/20200616/058c4bae/attachment.sig>