search

NINAnor / ecRxiv

A publishing platform for Ecosystem Condition indicators
GNU General Public License v3.0
0 stars 5 forks source link

How to update templates in existing forks #13

Closed anders-kolstad closed 5 months ago

anders-kolstad commented 5 months ago

Not sure how to do this. If I change something in any of the templates under indicators/, I can of coarse sync the fork, but since I already probaly will have renames the folders in my forked repo, the newly updated template will emerge inside a new folder, and it will not attampt to merge with my existing template(workgin document.

frafra commented 5 months ago

git is usually smart enough to understand that a file has been renamed, even when it has been edited. I would suggest using git mv for all the other cases. I hope I have understood your problem correctly 😄

You can also consider using tools that generate a project from a template, such as copier. We use it for various Python projects in NINA.

anders-kolstad commented 5 months ago

Yes. The problem was just for xlsx files when git made copies because it didnt want to delete anything. (I have small xlsx files for some metadata.) The sync fork option on github seems to be quite good, but there will always be conflics and that needs resolving. I found the descriptions from manubot helpful.