pull to update my fork - Githubissues

rprops / Phenoflow_package

R package offering functionality for the advanced analysis of microbial flow cytometry data

GNU General Public License v2.0

9 stars 5 forks source link

Closed FMKerckhof closed 7 years ago

rprops commented 7 years ago

Large number of conflicts. I've updated all these functions. What's the most "elegant" workaround to make this merge possible?

FMKerckhof commented 7 years ago

Just deny the pull request, I will solve the conflicts on my part.