pipewrench icon indicating copy to clipboard operation
pipewrench copied to clipboard

Published 20 hours ago • verified publisher icon Cargill

Enhance standard templates

Open aaverbec opened this issue 6 years ago • 4 comments

aaverbec avatar Feb 18 '19 00:02 aaverbec

Hey @aaverbec looks like this has some conflicts that need to be resolved before the tests can be run

afoerster avatar Feb 20 '19 14:02 afoerster

I tried resolving the conflicts, but it wouldn't let me commit the changes back. So I just copied my resolved code back to the branch. On the remaining conflicts, they should take my changes. I'm not sure how to make github accept my resolved conflicts. (I fix all of the conflicts and then click the merge option and it just spins for an hour+ saying it is trying to merge)

aaverbec avatar Feb 20 '19 18:02 aaverbec

If you'd prefer, I can re-fork my repository from the current repo, and then re-make my changes, and re-submit a new PR.

aaverbec avatar Feb 20 '19 18:02 aaverbec

I've never tried the github tools for merging so I don't know about that. I'd recommend merging on the command line or re-forking like you said.

afoerster avatar Feb 20 '19 18:02 afoerster