Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [escet-dev] Remove install.asciidoc.org?
  • From: Dennis Hendriks <dh_tue@xxxxxxxxxxx>
  • Date: Thu, 18 Mar 2021 08:23:10 +0000
  • Accept-language: nl-NL, en-US
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sIMsiJ8vP6KQCJ0dQuV1tvqwNUVElONhz4JwA762l/g=; b=BWFdZAzgsagFKb9zOTf9Syk5rpRN1Kr20xA36/U4TWg6WgxxGdadcaIi+P5Tm3rBAqbY1bUWAUAxDNPbOeYoO8C6LtE6bxltWpvhwNUcTd9qkw9wi9jtG1IZPHCFN4FKmw7MbDVl2dto/KbtEl/U5K9s79ye/3z8YbkW/1eWh81ux7unY2VUv7kMo/URlHZOgkEPX9Cxr6BYLCUu2qx8wZLZiFZHNsmstvrTr7cZ8fVn667DZP5encRlv72ct2luBxA8sCtvflVcgc8DGAEuUul0CltxWDoWKIVQDJm6tKai8ffcKUPE0n8g6EGAgZZD4nIdhU2PtRXU7ZR8svL2GQ==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fe+4AZRRBDrTeJVoL7qPKC5gFisIXQwowaavyKkBx+kheAThWko+my9HE3EIBdCRib0iCg2nTNL6wuOTyp+Fc4d2bFIIyY9uPZC51c2NbluSr935uj9I8DlS+kV+bj3ICJuHqcAQerVWKUyxicyScPHD+CPttz3ye8Vns7nTUGDo1OfD1PlvPP0x3CJ8oBKGDr1lehtd6nV/YXfUDCZfCqK114y5Gk2YznNkLXrMs1keKdw1q76yZYVx91x7X/Ol/scdhnR7X2+X6CSzdSNp71HMvZMxHXIvRwdUyqKMrlaEc3bMW+ujbokgUgSk8ILYsiUfgfvQ6xLiWZB/XOeljQ==
  • Delivered-to: escet-dev@xxxxxxxxxxx
  • List-archive: <https://dev.eclipse.org/mailman/private/escet-dev/>
  • List-help: <mailto:escet-dev-request@eclipse.org?subject=help>
  • List-subscribe: <https://dev.eclipse.org/mailman/listinfo/escet-dev>, <mailto:escet-dev-request@eclipse.org?subject=subscribe>
  • List-unsubscribe: <https://dev.eclipse.org/mailman/options/escet-dev>, <mailto:escet-dev-request@eclipse.org?subject=unsubscribe>
  • Thread-index: AQHXG0ovl0M0z7oIQEujTnA4Syf9KaqIXteZgABtXQCAAJMkAIAAA3QAgAAB14CAAAIVAIAAAVNa
  • Thread-topic: [escet-dev] Remove install.asciidoc.org?
Hi Bert,

Indeed, you first created a branch without merge request, and then a merge request and branch together (the '...-2' one). You commited to the first branch.

You can create a merge request now on the first branch. See 'New merge request' button at https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests.

Then close the 2nd merge request. At https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/23, select the arrow next to 'Mark as ready' and choose 'Close merge request' from the drop down.

Then manually remove the '...-2' branch. At https://gitlab.eclipse.org/eclipse/escet/escet/-/branches select the red remove button to the right of the branch. Make sure not to remove the wrong branch!

Dennis


Van: escet-dev <escet-dev-bounces@xxxxxxxxxxx> namens Martijn Goorden <mgoorden@xxxxxxxxx>
Verzonden: donderdag 18 maart 2021 09:14
Aan: escet developer discussions <escet-dev@xxxxxxxxxxx>
Onderwerp: Re: [escet-dev] Remove install.asciidoc.org?
 

I see the issue. There are two branches starting with “21-improve-…” While you committed the changes to one of them, the merge request is on the second one (ending with “-2”).

 

From: escet-dev <escet-dev-bounces@xxxxxxxxxxx> on behalf of "Beek, Bert van" <D.A.v.Beek@xxxxxx>
Reply to: escet developer discussions <escet-dev@xxxxxxxxxxx>
Date: Thursday, 18 March 2021 at 09.06
To: escet developer discussions <escet-dev@xxxxxxxxxxx>
Subject: Re: [escet-dev] Remove install.asciidoc.org?

 

I see them here:

 




On 18 Mar 2021, at 08:59, Martijn Goorden <mgoorden@xxxxxxxxx> wrote:

Hi Bert,

I see that the branch doesn't contain any commits pushed to the server. Therefore, it can't identify any changes.

Martijn

On 18/03/2021, 08.47, "escet-dev on behalf of Beek, Bert van" <escet-dev-bounces@xxxxxxxxxxx on behalf of D.A.v.Beek@xxxxxx> wrote:

   I have just committed the update to the installation instructions in the new branch 21-improve-installation-intructions-for-macos and pushed and then created a merge request. However, the merge request says: "Currently there are no changes in this merge request's source branch. Please push new commits or use a different branch.” What am I missing?

   Bert


On 18 Mar 2021, at 00:00, Beek, Bert van <D.A.v.Beek@xxxxxx> wrote:

I have not yet committed anything, on purpose, waiting for the decision on the command line utilities, which also affects the manual. Sorry about the install.asciidoc.org question. Stupid question, I think I created the file myself, so obviously I should delete it before committing.

Bert


On 17 Mar 2021, at 17:31, Dennis Hendriks <dh_tue@xxxxxxxxxxx> wrote:


I see the branch you created on the GitLab server. I don't see any commits. See https://eur02.safelinks.protection.outlook.com/?url="" Maybe you committed locally but didn't push it to the remote yet? So I'm not sure yet what you mean with install.asciidoc.org as I can't see you changes yet.

Dennis

Van: escet-dev <escet-dev-bounces@xxxxxxxxxxx> namens Beek, Bert van <D.A.v.Beek@xxxxxx>
Verzonden: woensdag 17 maart 2021 17:25
Aan: escet developer discussions <escet-dev@xxxxxxxxxxx>
Onderwerp: [escet-dev] Remove install.asciidoc.org?

I have created a branch to update the macOS installation instructions via Gitlab and I noticed that Gitlab has added the original version of the updated manual as install.asciidoc.org. What I do with this file when committing my changes, do I delete this new install.asciidoc.org file?

Bert
_______________________________________________
escet-dev mailing list
escet-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://eur02.safelinks.protection.outlook.com/?url=""> _______________________________________________
escet-dev mailing list
escet-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://eur02.safelinks.protection.outlook.com/?url="">

_______________________________________________
escet-dev mailing list
escet-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://eur02.safelinks.protection.outlook.com/?url="">


   _______________________________________________
   escet-dev mailing list
   escet-dev@xxxxxxxxxxx
   To change your delivery options, retrieve your password, or unsubscribe from this list, visit
   https://eur02.safelinks.protection.outlook.com/?url="" href="http://2Fdev.eclipse.org">2Fdev.eclipse.org%2Fmailman%2Flistinfo%2Fescet-dev&amp;data="">
_______________________________________________
escet-dev mailing list
escet-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://eur02.safelinks.protection.outlook.com/?url="">

 

Back to the top