Closed 7yl4r closed 1 year ago
I restored the setup file using the following commands:
(base) tylar@tylar-gram:~/repos/obis_zooplankton_setup$ git remote add upstream git@github.com:USF-IMARS/mbon_zooplankton_to_dwc.git
(base) tylar@tylar-gram:~/repos/obis_zooplankton_setup$ git fetch upstream
remote: Enumerating objects: 65, done.
remote: Counting objects: 100% (64/64), done.
remote: Compressing objects: 100% (21/21), done.
remote: Total 37 (delta 26), reused 25 (delta 16), pack-reused 0
Unpacking objects: 100% (37/37), 7.92 KiB | 676.00 KiB/s, done.
From github.com:USF-IMARS/mbon_zooplankton_to_dwc
* [new branch] 7yl4r-patch-1 -> upstream/7yl4r-patch-1
* [new branch] linux_testing -> upstream/linux_testing
* [new branch] main -> upstream/main
* [new branch] taxa_redo -> upstream/taxa_redo
* [new branch] test_diaglog_box -> upstream/test_diaglog_box
(base) tylar@tylar-gram:~/repos/obis_zooplankton_setup$ git checkout upstream/main -- Rmd/00_setup_project.Rmd
(base) tylar@tylar-gram:~/repos/obis_zooplankton_setup$ git commit -m 'restore setup file to upstream'
[main 0d7eefa] restore setup file to upstream
1 file changed, 10 insertions(+), 10 deletions(-)
(base) tylar@tylar-gram:~/repos/obis_zooplankton_setup$ git push
Enumerating objects: 7, done.
Counting objects: 100% (7/7), done.
Delta compression using up to 8 threads
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 378 bytes | 378.00 KiB/s, done.
Total 4 (delta 3), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (3/3), completed with 3 local objects.
To github.com:7yl4r/obis_zooplankton_setup.git
f70eade..0d7eefa main -> main
Any changes made on the 7yl4r:main branch will be added to this PR. GitHub might have made you able to edit that branch because I made this PR. I made the requested changes and requested a re-review.
Note: if the modifications to the setup file had been on their own commit, we could do this even more cleanly:
git rebase -i
so the changes to that file look to have never happenedNote_2: The commits in this PR can be squashed down into one commit, and in that commit there will be no diff on the setup file, so there will be no edit history added to it from this PR.
These kinds of concerns are better left ignored for smaller projects, but they are good things to know when working with many collaborators.
@sebastiandig : this merge from my fork into the USF-IMaRS repo should work without issue.
Take a look at the suggested changes then hit merge and these changes will be pulled over into the USF-IMaRS:main.