search

decoderleco / deces_europe

programme R pour créer des analyses des décèes en Europe
28 stars 10 forks source link

#19 Only source code in root dir. Generated data are now in gen(eration) directory #22

Closed JeanGarf closed 3 years ago

JeanGarf commented 3 years ago

Hi Pierre,

I made a lot of changes to put generated data in : gen/csv gen/images gen/rds

The data provided by git are now in : data/csv data/images

The downloaded data remains in : inst\extdata\deces

Therefore, in the root dir, remains only source code

Due to an error in using git (after having renamed scripts to add a prefix number) , this branch contains also the following modifications :

5 (.keep file canceled and replaced by a dir.create)

10

21

WARNING : Be carefull when merging the other pull requests due to to the renaming of the scripts !

JeanGarf commented 3 years ago

Hi Pierre,

You'll find here a screen shot of the new data organization.

#19_ScreenShot

decoderleco commented 3 years ago

Hi! Thx for all your work. I still have major issues with my PC. I do not find the pb. It crashes all the time but only in my home. I cannot do much until I identify the problem... Best regards,

Pierre

Le sam. 26 juin 2021 à 14:41, JeanGarf @.***> a écrit :

Hi Pierre,

You'll find here a screen shot of the new data organization.

[image: #19_ScreenShot] https://user-images.githubusercontent.com/53929184/123513273-90eabb00-d68c-11eb-9c74-32515fbe912a.JPG

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/decoderleco/deces_europe/pull/22#issuecomment-868995620, or unsubscribe https://github.com/notifications/unsubscribe-auth/AUBA4XAQKEWVNZ3GJNKMEZTTUXDIHANCNFSM47IUEW5Q .

decoderleco commented 3 years ago

Bonjour, j'essaye le français, c'est plus simple pour moi. Je viens de récupérer mon PC qui à l'air de fonctionner (une barrette de RAM défectueuse probablement). J'ai fait les merge sur tout le reste. Pour celui-ci il y a des conflits donc je ne peux pas faire le merge... Je ne sais pas comment résoudre les conflits étant nouveau sur Git. Saurais-tu m'orienter ?

Amicalement,

Pierre

JeanGarf commented 3 years ago

Bonjour Pierre

Désolé de ne pas avoir répondu plus vite, mais j'étais très pris ces derniers jours.

Finalement, j'ai l'impression que tu as réussi à tout merger.

C'est nickel.