search

inbo / fish-tracking

🐟 Collection of scripts for processing and analysing fish tracking data
3 stars 0 forks source link

Distance frome #67

Closed PieterjanVerhelst closed 3 years ago

PieterjanVerhelst commented 3 years ago

@damianooldoni did you make any changes in the .gitignore file?

damianooldoni commented 3 years ago

Yes. https://github.com/inbo/fish-tracking/commit/be8348685d9f5381081fea1d36055092121c1e46#diff-bc37d034bad564583790a46f19d807abfe519c5671395fd494d8cce506c42947 but it is wrong, it seems as .Rhistory is still committed. We should avoid to get R history in repository.

I will resolve the conflict first and then I let you merge. Sound it good to you?

PieterjanVerhelst commented 3 years ago

Yep, that's good! Indeed, that .Rhistory issue was something I forgot to ask. You indicated this earlier after which I put it in the .gitignore, but the issue persists.

PieterjanVerhelst commented 3 years ago

@damianooldoni not sure how to resolve the conflict.