search

milc-qcd / milc_qcd

MILC collaboration code for lattice QCD calculations
Other
34 stars 33 forks source link

Feature/stagg mg #33

Closed weinbe2 closed 3 years ago

weinbe2 commented 4 years ago

This PR addresses a stray } that accidentally found its way into the first PR. It also replaced the CTIME = with CTIME ?= to streamline overriding CTIME from the command line.

weinbe2 commented 4 years ago

@detar FYI on some MG-specific bugfix changes here. This should be a clean merge otherwise.

weinbe2 commented 3 years ago

@detar what's the status of you merging this into develop?

weinbe2 commented 3 years ago

Or at least into the feature/staggMG branch in the MILC repo as opposed to my own? I saw some recent commits to develop had MG-related content, which could become a merging headache...

detar commented 3 years ago

Hi Evan,

I am not super fluent in git.  The original PR pointed to an incorrect branch of milc-qcd.  I merged those changes by hand at that time, and you have been using them.  So that PR was still posted on the milc-qcd repo, but I thought it was stale.  Your question suggests not.  What is its current status?

I haven't touched feature/staggMG for a couple weeks.  If your PR is still open and needed, I guess I should merge it with the feature/staggMG branch, then merge develop into feature/staggMG to resolve any conflicts, and finally, merge the result into develop, so we can close the feature/staggMG branch and work from develop from now on.

Best,

Carleton

On 7/29/20 1:31 PM, Evan Weinberg wrote:

@detar https://github.com/detar what's the status of you merging this into |develop|?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/milc-qcd/milc_qcd/pull/33#issuecomment-665858775, or unsubscribe https://github.com/notifications/unsubscribe-auth/ABP6HXSXPOZXBZHG7LN2TT3R6B2JBANCNFSM4NZUYSYQ.

weinbe2 commented 3 years ago

That PR was stale and I believe I got rid of it, this is a new PR.

I remember the difficulties you went through last time, so I checked carefully that this PR is merging into the milc-qcd repo's feature/staggMG branch and not directly into develop. I can make some time today to merge develop into my branch so it'll be a clean one-two effort for you to merge this branch directly into MILC develop.

detar commented 3 years ago

I went ahead and merged the PR. I'll reconcile milc-qcd:develop with milc-qcd:feature/staggMG next.

weinbe2 commented 3 years ago

Thank you Carleton, yesterday got away from me.