pluto icon indicating copy to clipboard operation
pluto copied to clipboard

Published 20 hours ago • verified publisher icon ZystemOS

Update feature branches

Open Dawid33 opened this issue 2 years ago • 6 comments

Many branches are far behind the develop branch. After splitting the project into packages I'd like to update the existing feature branches to be up to date so that it is easier to merge them later on.

Dawid33 avatar Jun 18 '22 20:06 Dawid33

That sounds good to me. Feel free to make PRs with the needed changes :)

Note that the arm port is very old so I can update that one, and the vfs-syscalls branch is deprecated

SamTebbs33 avatar Jun 19 '22 17:06 SamTebbs33

Okay no problem, I started updating the arm port before I read your comment. I have it compiling but it still needs a lot of work.

Dawid33 avatar Jun 19 '22 20:06 Dawid33

Wow I thought it would be a huge job to even get it building. Nice one.

SamTebbs33 avatar Jun 19 '22 22:06 SamTebbs33

Thanks. The x86_64 port will be much more of a handful I think. I merged it on my machine to see if I could do it quickly but its probably a few days work for me.

Dawid33 avatar Jun 20 '22 06:06 Dawid33

How are you doing it? Rebasing (rather than merging) the branch on top of develop will probably be the easiest option.

SamTebbs33 avatar Jun 20 '22 09:06 SamTebbs33

I started by merging develop into x86_64, I think you're right that it would be easier. I'll try that instead when I have time. I usually just merge everything, I guess I have to learn how to use rebase eventually :)

Dawid33 avatar Jun 20 '22 11:06 Dawid33