Wip

[MitchBradley]

[quozl]

The branch predates my work on PlatformIO so unable to test it directly, but did cherry-pick all later commits onto my rebased try-wip branch on https://github.com/MitchBradley/cforth/pull/113 and did build the pico firmware without error. This is not a test of the new code, but rather a test that my builds don't fail once the new code is merged.

[Jos-Ven]

*.f files are for me an indication that they also run under Gforth and Win32Forth. I hope that it is OK to use these extensions.

[quozl]

I see, thanks.

[Jos-Ven]

The branch predates my work on PlatformIO.... I can also copy the changed files to my main branch on my PC test them and adapt what is needed. Then when they are alright, push them to the main branch of Mitch. Would that be alright?

[quozl]

There is much you can do, but it is up to you whether to do it. I can give you ideas, but you need to be comfortable with using git, either with the repository you are already using or with a backup.

You could;

• fetch, check out and test my try-wip branch, see if it does everything you need, and if so review my pull request and approve it, or;
• visualise the history (e.g. gitk --all or git log) and use git cherry-pick to bring in to your branch the changes to master that happened in the time since you departed from it, or;
• rebase in the same manner that I did when I created the try-wip branch.

On the other hand, Mitch might be fine with just merging as is. Up to him. I find histories with many merge commits problematic because git bisect is harder, but there are people who don't mind that.

[MitchBradley]

I have worked on projects that insisted on linear history, avoiding merge commits like the plague, and ones that just hit merge and lets the chips fall where they may. The former is probably better when lots of people are involved, the latter likely easier for small teams. I don't have a strong preference either way.

[quozl]

@MitchBradley, thanks.

@Jos-Ven, what is your view on linear history vs merge commits?

[Jos-Ven]

I am under the impression that merge commits might lead into problems.

Keeping history is not so important for me. I still can see what has been changed or added. Some c-parts could be implemented better. When it is up to me, then I would like to push the changes with possible improvements to the main branch. Ok?

[MitchBradley]

PR to master is okay with me.

[Jos-Ven]

PR to master is okay with me. I also agree and will test the result.