Hey @georgeomics! The code in continuous was behind and ahead of main, so I needed to go through and resolve the conflicts. Fortunately, git merge -s resolve main was able to resolve most of this, except for...
Simple merge failed, trying Automatic merge.
Added ecoinfoscrg/R/MetaAnalysis/BUPD.R in both, but differently.
ERROR: content conflict in ecoinfoscrg/R/MetaAnalysis/BUPD.R
Added ecoinfoscrg/R/MetaAnalysis/getBetas.R in both, but differently.
ERROR: content conflict in ecoinfoscrg/R/MetaAnalysis/getBetas.R
Added ecoinfoscrg/R/MetaAnalysis/pruning.R in both, but differently.
ERROR: content conflict in ecoinfoscrg/R/MetaAnalysis/pruning.R
Added ecoinfoscrg/R/MetaAnalysis/standardize.R in both, but differently.
ERROR: content conflict in ecoinfoscrg/R/MetaAnalysis/standardize.R
Added ecoinfoscrg/R/MetaAnalysis/varCov.R in both, but differently.
ERROR: content conflict in ecoinfoscrg/R/MetaAnalysis/varCov.R
Added ecoinfoscrg/R/MetaAnalysis/wranglingCleaning.R in both, but differently.
ERROR: content conflict in ecoinfoscrg/R/MetaAnalysis/wranglingCleaning.R
I selected all the code that matches the current versions of these files on continuous. You might want to check just to be sure, but I backed up the originals just in case.
georgeomics
commented
3 months ago
Hey @georgeomics! The code in continuous was behind and ahead of main, so I needed to go through and resolve the conflicts. Fortunately,
git merge -s resolve mainwas able to resolve most of this, except for...I selected all the code that matches the current versions of these files on
continuous. You might want to check just to be sure, but I backed up the originals just in case.