search

McIntosh-Lab / tvb-ukbb

TVB-UKBB Pipeline: TheVirtualBrain implementation of the UK Biobank pipeline
Other
22 stars 12 forks source link

Adni3 dev to ADNI3 #187

Closed justinliuyuwang closed 4 months ago

justinliuyuwang commented 1 year ago

Issue: Pull request shows commits that have already been brought over

pmahon3 commented 1 year ago

I don't think this a critical issue, it appears it will just be logging commits twice. The result in the code is the same, the git history will be messier.

https://stackoverflow.com/questions/16306012/github-pull-request-showing-commits-that-are-already-in-target-branch

I think if we just resolve and merge it will be fine

pmahon3 commented 1 year ago

also I'm going to include the VBM integration with this merge. I've added the first version here and am testing. @shen4brains @justinliuyuwang If we could review before the merge at some point that would be great