search

avh-bern-berlin / avh-texts

AvH texts
https://www.humboldt.unibe.ch
2 stars 0 forks source link

Please check this pull/push, doesn't seem right #22

Closed rexclark2 closed 3 years ago

rexclark2 commented 3 years ago

I did a normal pull/push just now, and do not understand why all of these files are here that others have edited, so please check that the edits were not somehow overwritten? Thanks as always...

Screen Shot 2021-09-11 at 22 03 07

rexclark2 commented 3 years ago

OK, perhaps incorrect, at first it looked like with the file timestamp that I had overwritten the edits from Paula Steck, but looking at it now, perhaps not, sorry to bother.

haoess commented 3 years ago

Looks good to me too, I've checked some files with changes from Paula and her edits are on the current/latest main.

https://stackoverflow.com/questions/12895980/git-avoiding-merge-branch-master provides some more information on this git message regarding workflow and some insights.

Feel free to close this ticket.