search

r-hyperspec / hySpc.read.txt

Import ASCII formatted data into hyperSpec
https://r-hyperspec.github.io/hySpc.read.txt/
MIT License
0 stars 1 forks source link

Update drat workflow #18

Closed GegznaV closed 4 years ago

GegznaV commented 4 years ago

Mainly style related changes in drat workflow file. Some lines were moved to a different step. One redundant step was removed.

GegznaV commented 4 years ago

I'll recheck that a bit later.

bryanhanson commented 4 years ago

You were correct: the forced add of .tar.gz was no longer needed.

bryanhanson commented 4 years ago

Alright, I'm a little lost with this pull review. Github is showing me suggested edits that I can't understand -- the formatting is odd and I can't tell where Github thinks the conflict is. If it's too mangled I can re-create the edits for the most part separately.

GegznaV commented 4 years ago

Leave the conflicts for me.

I have a very good program called Meld (if you try google it, keywords are "meld merge") that I use for solvong Git conflicts. It works on Windows and I'm not sure if it is available on Mac.

2020 rugp. 17, pr 22:19, Bryan Hanson notifications@github.com rašė:

Alright, I'm a little lost with this pull review. Github is showing me suggested edits that I can't understand -- the formatting is odd and I can't tell where Github thinks the conflict is.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/r-hyperspec/hySpc.read.txt/pull/18#issuecomment-675064430, or unsubscribe https://github.com/notifications/unsubscribe-auth/ADBC43B7LSRKYQY3W2YGXIDSBF7CLANCNFSM4QBVIMOQ .

GegznaV commented 4 years ago

I do think this is required. The add -f is not.

add -f is needed when we want to add a new git-ignored file.

GegznaV commented 4 years ago

where Github thinks the conflict is.

I've solved the conflicts.

bryanhanson commented 4 years ago

Thank you!