Git contributing

[Maarten Vermeulen]

Hi all,

The last few months have been quite boring and empty when it came to new features to Night. It's been a busy time for 

some of us but now that I have some more time leftover I'll have more time for Night.

In the past, working together with Git/GitHub didn't go so well. We'd often break each other's work after one of us

pushed a new commit, leading to the other having a problem with pushing their changes or getting their work to work.

Mercury and I have been thinking about improving this workflow. We think that using pull requests in the future may solve this issue.

However, I wanted to ask if anyone knows any other solutions.

Does anyone have suggestions about how to avoid messing up each other's work? I only really know pull requests and just 

committing changes while not touching the files the other is working on. 

[Antony]

Funny you should mention that.

Here's a good read on how to work on git as a team.

https://nvie.com/posts/a-successful-git-branching-model/

Here's another good one

https://stackify.com/git-checkout-remote-branch/

I would add one additional thing, before you push, ALWAYS do a git pull to make sure you see the latest changes. 

In addition, NO ONE should be working on the Development branch. You make your own branch and build and such there, then push to Development. There should be a Master branch that has the current working version (that builds successfully) 

I don't know why you all didn't reach out to me sooner. This is what I do everyday.

-Tony

[Mercury Thirteen]

On Tuesday, March 17, 2020 at 1:57:06 PM UTC-4, Antony wrote:

Funny you should mention that.

Here's a good read on how to work on git as a team.

https://nvie.com/posts/a-successful-git-branching-model/

Here's another good one

https://stackify.com/git-checkout-remote-branch/

I will check those out. Thanks!

 

I would add one additional thing, before you push, ALWAYS do a git pull to make sure you see the latest changes. 

In addition, NO ONE should be working on the Development branch. You make your own branch and build and such there, then push to Development. There should be a Master branch that has the current working version (that builds successfully) 

I don't know why you all didn't reach out to me sooner. This is what I do everyday.

-Tony

Last we talked you had several significant things going on in life, so it didn't seem pertinent. Besides, it's not like you hadn't already advised us to use pull requests eons ago as opposed to what we have been doing. It just took me forever to change - as is sometimes my custom lol

[Antony Gordon]

All,

Has anyone looked at this site?

Any questions on the workflow?

-T

--
You received this message because you are subscribed to the Google Groups "Night Kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to night-dos-kern...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/night-dos-kernel/74a119f7-f62f-4945-8c9d-5e6561a7d017%40googlegroups.com.

[Mercury Thirteen]

I have skimmed them over and think I get the general gist of it. Since the master branch should always contain a "ready-to-run" version of the project, and since we don't yet have a version that really does anything useful to an end user, I figured it made more sense to wait until we get something functional to populate a master branch. Or do think it's worth putting up what we have so far - a kernel which may not run applications or anything yet, but will boot and get tho the kernel menu?

[Antony Gordon]

Hi,

I see no one responded.

Master should contain any version of NK that builds successfully and does what it’s supposed to do AT THAT POINT in time. 

Once you finalize memory management and it’s tested and working, that version of NK should be in master. Development should then move to the next milestone. I would add that what goes into Master is anything that will run in VM or bare metal.

You say the current NK doesn’t do anything meaningful. If it boots, recognizes multiple drives and shows the menu and the keyboard works, that’s a viable master. 

Ultimately, it’s your call.

--
You received this message because you are subscribed to the Google Groups "Night Kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to night-dos-kern...@googlegroups.com.

To view this discussion on the web visit https://groups.google.com/d/msgid/night-dos-kernel/0068d924-98ad-4b6c-8009-a26fa3b15602%40googlegroups.com.

[Mercury Thirteen]

Nice, this answers the dilemma pretty concisely. Upon completing what I'm working on now, I'll update Master to reflect that too.

Thank you!