Merge question

[siemvaessen]

We are making use of 2 separate branches, Master for our case of IATI activity file transformation and branch 959-org-file for organisation file transformation. While we are OK with managing 2 separate branches for now, we are wondering when ODS expects them to be merged. I know/guess this will happen at some stage, just looking for some ETA on this - 2018, 2019?

@robredpath @rory09 (bcc @stevieflow bcc-backup @Bjwebb )

[andylolz]

@siemvaessen: There’s a TODO list here: #993 (comment)

Someone who’s not Ben (or me) needs to review the code.

[siemvaessen]

Right, did read that, just totally forgot abt it.

[stevieflow]

I've reviewed the spreadsheet end of things, and works well. I've a couple of questions about integration with the current setup

Have asked @rory09 to take another look at that

Over to @robredpath & @kindly in terms of code review.

[andylolz]

Over to @robredpath & @kindly in terms of code review.

@stevieflow could you assign them as reviewers on #993?

[andylolz]

@siemvaessen good news I think! #959 appears to have been added to the current sprint just yesterday. So by the end of the month (in time for the TAG) this may very well be merged!

[siemvaessen]

yes! Good news indeed.

[andylolz]

Great – this is merged! 🙌

@robredpath any chance PWYF could be credited for the work I did on this? Looks like I’m currently the only external contributor to CoVE, and I see there’s no changelog. But it would be cool if an acknowledgement could be added somewhere for this work (plus the related work I did on flatten-tool). Let me know if that’s possible, thanks.

[robredpath]

@andylolz of course - how's #1061 ?

[andylolz]

PERFECT. Thanks!

[robredpath]

@andylolz this has prompted me to look again at our CLAs - thanks for the report of the link not working any more!

In order to credit PWYF I think we'll need to get them to sign an organisation CLA, as so far your contributions have been under your personal CLA. Is that something that PWYF will want to do?

I've updated #1061 with a few more credits, and to reflect the issue around CLAs. We won't merge it just yet, until we can get that sorted out!

[andylolz]

Is that something that PWYF will want to do?

Probably difficult to say without a link to the CLA.

I fixed the link, but actually the PDF that contributoragreements dot org generates looks pretty borked. I reckon it would be better to generate your own PDF and stick that on github. Or just drop the CLA?

[andylolz]

Is that something that PWYF will want to do?

Kk, I checked – probably not. So #1061 LGTM as it stands (at 8ba37a8).