search

os-climate / itr-data-pipeline

Produce data for ITR tool using data from Data Commons
Apache License 2.0
3 stars 4 forks source link

Nz transfer retry #63

Closed MichaelTiemannOSC closed 4 months ago

MichaelTiemannOSC commented 4 months ago

Re-attempting to merge nz-transfer with main to create a clean pull request. Some historic DCO nastiness is going to make this a nightmare for me.

ModeSevenIndustrialSolutions commented 4 months ago

I have manually/explicitly set DCO to pass on this change - rewording the commit messages using the rebase method seems to flag various merge conflicts. I have no idea why a PR with a bunch of linear commits should be doing this...

ModeSevenIndustrialSolutions commented 4 months ago

Normally, you should be able to do something like:

git rebase -i HEAD~104

Then:

reword f6b175a upload files reword b55c2c2 Changes needed for ITR V2 work. reword 6e20a11 Update pipeline to work with 2023 RMI data

The primary issue causing this PR to be flagged seems to be the change of email addresses:

Commit sha: f6b175a, Author: Michael Tiemann, Committer: Michael Tiemann; Expected "Michael Tiemann 72577720+MichaelTiemannOSC@users.noreply.github.com", but got "MichaelTiemannOSC mtiemann@os-climate.org". Commit sha: b55c2c2, Author: MichaelTiemann, Committer: MichaelTiemann; Expected "MichaelTiemann 72577720+MichaelTiemannOSC@users.noreply.github.com", but got "MichaelTiemannOSC mtiemann@os-climate.org". Commit sha: 6e20a11, Author: MichaelTiemannOSC, Committer: MichaelTiemannOSC; Expected "MichaelTiemannOSC mtiemann@os-climate.org", but got "Michael Tiemann 72577720+MichaelTiemannOSC@users.noreply.github.com".