search

ewels / clusterflow

A pipelining tool to automate and standardise bioinformatics analyses on cluster environments.
https://ewels.github.io/clusterflow/
GNU General Public License v3.0
97 stars 27 forks source link

Merge BI changes into main development flow #25

Closed ewels closed 9 years ago

ewels commented 9 years ago

@s-andrews and @FelixKrueger - it seems that I can create a Pull Request from your fork to mine, even without push permissions on your fork. It looks like this will delete a lot of my additions though, so I need to figure out how to bring your changes in without wiping everything I've done since you forked.

s-andrews commented 9 years ago

Yeah, I did a merge between the v0.4devel branch and master in our version so that might mess you up until you've merged them at your end. It shouldn't delete additions you've made through?

ewels commented 9 years ago

So what happens when you look at the pull request comparison is that merging your fork into my 0.4devel branch treats any changes I've made since your fork as deletions. Essentially your repo takes priority.

I think that the best way to handle this is for you to merge my changes into your repository, so that my recent changes take priority over your older code where the two differ (we can do this in a new branch of your repository so that it doesn't affect your active code). Once you've pulled in my changes we then do a pull request back with everything that's left. Which should be just your changes.

Does that make sense? We need to be a little co-ordinated as to when this happens so that I don't push any new commits after you pull in my changes (or you need to give me write access to your repo so that I can do the above changes myself).

s-andrews commented 9 years ago

I've given you access to our fork, feel free to make a new branch and go nuts.

ewels commented 9 years ago

Nice, thanks!

ewels commented 9 years ago

Pull Request initiated in https://github.com/ewels/clusterflow/pull/27

ewels commented 9 years ago

Done!