search

km-git-acc / dbn_upper_bound

Computational effort to upper bound the de Bruijn-Newman constant as part of a Polymath project
Other
13 stars 12 forks source link

Trying to merge #94

Closed teorth closed 5 years ago

teorth commented 5 years ago

For some reason I can't merge automatically because there is a conflict with debruijn.pdf . I have tried to delete my copy of the pdf but it is still claiming a conflict. Hoping that someone on the km-git-acc end can make the pull request go through - I must say I find git very confusing to use!

km-git-acc commented 5 years ago

@teorth It seems Git finds it easier to analyze and merge text files compared to other files. I downloaded the conflicting files from the teorth/../Writeup folder and replaced the corresponding ones here, so the pull is successful. This method of resolving conflicts should work in general, although it is cumbersome. Also regenerated the pdf from the latest tex files and uploaded it.