Closed sschleemilch closed 2 months ago
@erikbosch what to do with obsolete/
tools? I guess I should not port them, right?
I did not check whether they work...
@erikbosch what to do with
obsolete/
tools? I guess I should not port them, right? I did not check whether they work...
Just ignore them
MoM:
I do not really know why it still reports conflicts, anyhow leaving for the weekend now
I do not really know why it still reports conflicts, anyhow leaving for the weekend now
It does not report conflicts for me. Maybe F5? Sure, let's check it again beginning of next week.
This is how it looks like for me
The Github UI merge/rebase sometimes have its limitations. I tried manually to do a rebase and a squash to get a clean history and it seems to to be the poetry.lock file that causes the conflict.
git rebase upstream/master
poetry lock
git add poetry.lock
git rebase --continue
git rebase -i HEAD~17
I uploaded the result at #383 for reference. Do you have a strong opinion whether all you commit shall be kept (as is) or not? I have a slight preference for squashing them like in #383 but it is not a strong opinion. I think the PR looks good now, no outstanding topics, so ready for merge. I see two options, either we can merge from #383 or if you do a rebase with main (plus possibly squash) and force push it to your branch
And I noticed that it is actually only the "rebase&merge" alternative that is disabled, the other works. But I try to avoid merge commits when possible/feasible. Squash is enabled in UI, so I could do it that way as well if you think squash is reasonable
And I noticed that it is actually only the "rebase&merge" alternative that is disabled, the other works. But I try to avoid merge commits when possible/feasible. Squash is enabled in UI, so I could do it that way as well if you think squash is reasonable
@erikbosch I am fine with squash merging 👍
Ok, then I might try squash&merge after lunch. We can anyway handle any regressions afterwards, if something unexpected would happen
Fixes #372 Fixes #345 Fixes #339
Cli using click
Root:
Export:
Exporter (JSON):
Todo
--case-sensitive
PortNot needed. Still works!contrib/