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

update output directory and add readme along with edit h_t_probable... #15

Closed dhjpolymath closed 6 years ago

sujitnair commented 6 years ago

@dhjpolymath It is still showing conflicts :( And 42 changed files.

Can you tell us what your steps are? I can help out. Something is off here.

sujitnair commented 6 years ago

@dhjpolymath

You will need to sync dhjpolymath:master with km-git-acc:master first before proceeding. See the following links on how to do it.

https://stackoverflow.com/a/19506355 https://help.github.com/articles/syncing-a-fork/

Once you do that, your master (both local and remote) will be the same as this. And then, you need to resolve your branch with your master. Once that is done, this PR will be fine.

dhjpolymath commented 6 years ago

@sujitnair I will close and reopen after starting with new repo and adding new edits