[Dune-devel] Confused about gitlab workings

[Steffen Müthing]

> Am 29.02.2016 um 13:51 schrieb Markus Blatt <markus at dr-blatt.de>:
> 
> On Sun, Feb 28, 2016 at 06:51:15PM +0100, Steffen Müthing wrote:
>>> Am 26.02.2016 um 21:55 schrieb Markus Blatt <markus at dr-blatt.de>:
>>> 
> 
>>> Yesterday I push a branch (matrix-loadbalance-to-more) to my fork of
>>> dune-istl at https://gitlab.dune-project.org/markus.blatt/dune-istl/
>>> and created a merge request. After that was merged, I wanted to delete
>>> my local branch after pull from origin, but to no avail:
>>> 
>>> git branch -d matrix-loadbalance-to-more
>>> error: Der Branch 'matrix-loadbalance-to-more' ist nicht vollständig
>>> zusammengeführt.
>>> Wenn Sie sicher sind diesen Branch zu entfernen, führen Sie 'git
>>> branch -D matrix-loadbalance-to-more' aus.
>> 
>> What is origin in your case? The official repository or your fork? The merge
>> commit won’t be automatically propagated to your fork, so if you only pulled
>> from the fork, you didn’t download the merge commit into your local repo.
>> That’s the only reason I can come up with for this behavior...
> 
> The origin of my problem is sitting in front of my laptop: me. I did
> never update to the new URL. Did not notice this until just now when a
> git fetch returned the error:
> 
> fatal: https://git.dune-project.org/repositories/dune-grid-howto/info/refs not valid: is this a git repository?
> 
> which I resolved by
> 
> git remote set-url origin ssh://git@gitlab.dune-project.org:22022/core/dune-grid-howto.git
> 
> I am sorry for the noise and confusion that I produced.

No worries, the exact same thing happened to me after switching the repositories, and it was
me who turned off the old server… ;-)

Steffen

> 
> Markus
> --
> Dr. Markus Blatt - HPC-Simulation-Software & Services http://www.dr-blatt.de
> Hans-Bunte-Str. 8-10, 69123 Heidelberg, Germany
> Tel.: +49 (0) 160 97590858
> _______________________________________________
> Dune-devel mailing list
> Dune-devel at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune-devel

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 455 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <https://lists.dune-project.org/pipermail/dune-devel/attachments/20160229/184f4219/attachment.sig>