Created a folder for Stockholm University / Department of Environmental Sciences

[BenildeB]

Hello,

I did create a folder for Stockholm University / Department of Environmental Sciences and submit our first MS2 spectrum. I am not familiar with GitHub, so let me know if I did something wrong. I noticed I did not do my previous pull request on the good base ("main" instead of "dev"). Thanks.

Best regards, Bénilde

[sneumann]

Hi Bénilde, thanks for the contribution! We'll have a look at the changes, there might be things we need to fix, and we'll come back to this soon. Yours, Steffen

[tsufz]

@BenildeB, I checked the PR. You try to merge your data from the main branch in your fork. Please add your new spectra in your dev branch and commit them. Then change the source of the PR to the branch BenildeB:dev. Afterwards, the PR should perform and the checks should. You don't need to close the PR, all changes are monitored and it will run as soon the merge conflict is solved. The reason of the merge conflict is that the main branch is not up to date with the dev branch. We never touch the main branch itself and work only in the dev branch.bIn the time of the release, the main branch is updated from dev (in the main repository).

Best wishes Tobias

[tsufz]

Hi @BenildeB, I found another issue. Rename your folder to "ACES_SU", which is the short name of your institution.

You must commit this change again to your repository.

Txs Tobias

[BenildeB]

Hi Tobias,

I'll do this. I understood everything, but I am not sure how I am supposed to do that. I'll do my best.

Regards, Bénilde

[meier-rene]

Hi @BenildeB, Tobias is right with all the points he listed. But sometimes its a bit tricky for people new to git to resolve all this conflict issues. I can sort out the git issues for you, all you need to do is put your files in a pull request. But it has to wait till next week, because I have other duties this week. Rene

[BenildeB]

Hi @meier-rene,

Thanks a lot. I did most of the modifications Tobias asked for, but I am definitely lost with GitHub, that's the first time I am using it. So, I did remove the first folder I did create in the main branch of my fork, create an ACES_SU folder in a new BenildeB:dev fork (the ":" disappeared in the process though) in which I uploaded our MS2 text files again and commit them. I am not sure to understand the pull request part that I don't have to do again, but I hope it will work better this time (or at least that it will give you less work). Thank you for your help.

Bénilde

[tsufz]

@BenildeB, No worries, we will try to make it by yourself. Two additional comments to understand the situation.

1. The source of the PR is still on BenildeB:main --> needs to be changed
2. The source of the data in BenildeB:Main is massbank-data:main.

Thus, try the following to solve the situation:

1. delete BenildeB:dev again.
2. fork massbank-data:dev to BenildeB:dev
3. create the folder ASES_SU
4. add your data
5. commit everything
6. change the source of the PR to BenildeB:dev

With this procedure, it should work.

new BenildeB:dev fork (the ":"

I suggest creating a branch called dev only. The colon : is a GitHub control character and thus cannot be used.

Best Tobias

[BenildeB]

@tsufz

It looks like I did something wrong. I'll follow your recommendations and try again, with a new pull request then. Thank you for your patience.

Best, Bénilde

[tsufz]

@BenildeB No worries, our instructions are quite 'basic' and thus not really focussed to GitHub newbies.

Best wishes, Tobias