Excessive spacing with defaults when in NormalStyle about cli HOT 19 CLOSED

For details about the fix,

Refer to https://github.com/go-easygen/wireframe/wiki/UsageStyle-of-package-cli

from cli.

How should I merge these changes?

from cli.

Oh, ..., seeing that you are redoing everything, I thought you'll be continue along that path.

Now that the two repos have diverged, there is no longer any easy way to merge them.

If I were you, I'd

• revert to the point before the diverge, while keeping all your new changes in the history.
• then merge automatically all the changes me and meisterluk made, from https://github.com/go-easygen/cli's master
• then fix any thing that are not done correctly, like #37, etc.

Otherwise, I see no way unless redoing everything manually.

from cli.

If the above all seems too complicated, I can help with my part. I.e., we divide and conquer -- I do the merge part you do the afterward-fixing. Alright?

from cli.

Alright. thx

from cli.

OK. Will do this weekend.

It's a huge change, so please review what I proposed again so that you completely understand what I'll be doing. If have any doubts, please let me know ASAP, as the least thing I want is to have my hard efforts rejected due to some misunderstanding.

Just to make sure. Pls confirm. Cheers.

from cli.

What issues are included in these changes? Just #42，#43?

from cli.

Well, actually I was talking about auto-merging all those changes that enhanced in the temp repo (ref: change log) since the cli dormant stage, done by meisterluk (committed on Jan 14) and me. Ref: #47.

That's why I said it's huge.
This is the only way to do auto-merging.

Otherwise, I see no way unless redoing everything manually.

Thus, please think twice.

from cli.

Hold on, maybe there are ways to cherry-pick what to merge back, but I've never done it before.

So now I'm thinking the best approach is for you to cherry-pick from the enhanced temp repo back to cli, since I've never done it before either (else, I can auto-merging all those changes for you).

Still the very first step is still to revert to the point before the diverge (while keeping all your new changes in the history).

from cli.

Maybe you can create a PR, then I merge it.

from cli.

Yeah, that's the plan. You meant PR that auto-merging all those changes right?

from cli.

You meant PR that auto-merging all those changes right?

Maybe I need to manually merge to resolve conflicts

from cli.

Please wait. I try manually merge first.

from cli.

sorry, you always only say half the sentence. I never know exactly what you plan is.
I'll stop chasing you around asking followup and confirmation questions.

So unless I got clear instruction from you what I should do, I'll assume you will be doing everything.
If you need my help, please describe exactly what I should do.

thx. G'd night.

from cli.

Ah, saw you update. Good, I'll leave it with you...

from cli.

Finished! See commit 7858d40

from cli.

NOTE: I have not used your submission for #40. See #40 for details

from cli.

I made a mistake！I push commits to go-easygen/cli, >..<

from cli.

NOTE: I have not used your submission for #40. See #40 for details

Yep, understood.

I made a mistake！I push commits to go-easygen/cli,

And now you've fixed it, :)

from cli.