Skip to content
This repository has been archived by the owner on May 18, 2022. It is now read-only.

filelist.csv not updated with Iceland grids #93

Closed
rouault opened this issue Dec 16, 2019 · 7 comments
Closed

filelist.csv not updated with Iceland grids #93

rouault opened this issue Dec 16, 2019 · 7 comments

Comments

@rouault
Copy link
Member

rouault commented Dec 16, 2019

@dalia2 Just to make sure if it is in your action items

@dalia2
Copy link
Contributor

dalia2 commented Dec 16, 2019

I added grids under branch:add-grids-for-Iceland/proj-datumgrid/filelist.csv , lines 201-206
https://github.com/dalia2/proj-datumgrid/blob/add-grids-for-Iceland/filelist.csv

@rouault
Copy link
Member Author

rouault commented Dec 16, 2019

Can you make a pull request with that ?

@dalia2
Copy link
Contributor

dalia2 commented Dec 16, 2019

I have opened pull request, can you take the filelist.csv file?

@kbevers
Copy link
Member

kbevers commented Dec 16, 2019

@dalia2 it looks like it would be easier for you to make a new branch from master and commit the filelist.csv to that new branch. Then submit a new pull request.

@dalia2
Copy link
Contributor

dalia2 commented Dec 17, 2019

I tried to make new branch update_filelist2 from master, but with new branch I can not get filelist.csv, this file is missing. In previous branch add-grids-for-Iceland I have filelist.csv file, that mean at that time on that version of OSGeo/proj-datumgrid the filelist.csv existed. Not sure what went wrong. The only solution what I see, I need to update (syncing) my proj-datumgrid fork with current newer version of master OSGeo/proj-datumgrid using this approach https://digitaldrummerj.me/git-syncing-fork-with-original-repo/ I will try to do that tomorrow.

@rouault
Copy link
Member Author

rouault commented Dec 17, 2019

What I can advise:

  • create a backup of your filelist.csv
  • git fetch origin (or whetever origin name you have chosen to point to https://github.com/OSGeo/proj-datumgrid)
  • git checkout master
  • git reset --hard origin/master
  • git checkout -b add_iceland_grids_to_filelist
  • manually merge your backup of filelist.csv

@rouault
Copy link
Member Author

rouault commented Dec 18, 2019

Fixed per #95

@rouault rouault closed this as completed Dec 18, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants