Extend column definition in config #117
Conversation
…g, support specify allow null column.
|
Thanks for the PR. Can you resolve the conflicts? |
|
I'm guessing PR 118 that added a new file means the conflicts can't be easily merged here on the site? Just wondering if someone else with permissions can resolve this, the PR itself is pretty straightforward. |
|
@MV10 conflicts are usually resolved from the working copy and pushed up to GitHub; the merge implemented here is very basic and isn't much good for anything but the simplest changes. |
|
@nblumhardt Right, I just meant prior to PR 118 being merged, this PR would have been a simple line-for-line replacement to merge. Was hoping maybe somebody with higher permissions had more options available to resolve conflicts and get things moving again. I haven't been able to find a way for a third party (me) to lend a hand fixing another person's PR merge conflicts. (I imagine it can be done through some sort of arcane git command line voodoo -- not my strong suit, to say the least.) |
|
@quinvit thanks again for the PR; are you keen to continue with this one, or should someone else jump in and take over from here? Many thanks! |
|
@mivano Sorry I am late. I've resolved it already. |
|
|
|
@mivano @nblumhardt Literally begging 😀 to have this PR merged so I can redo mine ... will soon be on vacation for a bit, and my wife won't want to see Visual Studio running at any point during that time, haha. |
|
Unfortunately I m on holiday with no access to a PC let alone visual studio
;-). Maybe @nblumhardt can do the honors?
Op zo 6 mei 2018 om 14:16 schreef Jon McGuire <[email protected]>
… @mivano <https://github.com/mivano> @nblumhardt
<https://github.com/nblumhardt> Literally begging 😀 to have this PR
merged so I can redo mine ... will soon be on vacation for a bit, and my
wife won't want to see Visual Studio running at any point during that time,
haha.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#117 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAozd3i8sbtEtz5hkkR4HxACbLzWnO1Zks5tvumAgaJpZM4TMLfy>
.
|
|
@merbla "I'm on holiday" should never be preceded by "unfortunately"! 👍 |
|
Sorry - was out for a few days, too! :-) Merged 👍 - thanks @quinvit ! |
Support binary data type, support allow null and data length for string and binary data type.