search

JakeDaBoss / Novis-Station

This is the repository for Novis Station, based on Baystation 12.
http://www.novis-station.net
Other
2 stars 7 forks source link

Fixes and additions. #50

Closed JakeDaBoss closed 8 years ago

JakeDaBoss commented 8 years ago

Nerfs, tweaks, fixes, the usual.

BlueNexus commented 8 years ago

You have two reviews: Resolve them both.

ghost commented 8 years ago

I like how our reviews happened within ten seconds of each other.

BlueNexus commented 8 years ago

I need confirmation that this will compile and pass bay's unit tests. I'm not convinced at the moment.

BlueNexus commented 8 years ago

Confirm this compiles?

JakeDaBoss commented 8 years ago

@BlueNexus https://4stor.com/uwIT4 https://4stor.com/7mGuO

BlueNexus commented 8 years ago

Have these features been tested in their current state, especially devsay? (Also, this PR still needs to be squashed)

JakeDaBoss commented 8 years ago

Not yet. I can check tomorrow. How do I squash again, or you got a ref page for me?

BlueNexus commented 8 years ago 
git rebase -i HEAD~[number of commits to squash]

Then change the "pick" beside each commit UNDER the top one to "s" press [esc] [:wq] [enter] Press [esc] [:wq] [enter] again on the next screen then

git push -f origin Oliver-test-branch:Oliver-test-branch
JakeDaBoss commented 8 years ago

@BlueNexus

JakeDaBoss commented 8 years ago

Can't be squashed. My updates are too erratic. Code and map.

JakeDaBoss commented 8 years ago

And you want me to do that post-edit now? This contains some pretty wanted fixes. This has been up for 3 days.

-------- Oorspronkelijk bericht -------- Van: BlueNexus notifications@github.com Datum: 13-10-2016 00:45 (GMT+01:00) Aan: JakeDaBoss/Novis-Station Novis-Station@noreply.github.com Cc: Jake Miles visiongamingjake@hotmail.com, Author author@noreply.github.com Onderwerp: Re: [JakeDaBoss/Novis-Station] Fixes and additions. (#50)

BlueNexus requested changes on this pull request.

Please ensure that mapmerge is used. A 2500 add/remove diff is unacceptable.

You are receiving this because you authored the thread. Reply to this email directly or view it on GitHub: https://github.com/JakeDaBoss/Novis-Station/pull/50#pullrequestreview-3977150

JakeDaBoss commented 8 years ago

@bluenexus

I suggest merging this and stop nitpicking every detail. I'll work mapmerge in the next update to make the diff lesser.

It's seriously aggravating with how slow this goes, as I get all the questions how the update is coming.

BlueNexus commented 8 years ago

Using mapmerge is standard practice, I expected you to know to do it. And here's an idea - Rather than bundling everything into one PR, which means it takes a long time to get merged, put separate things in separate PRs. I will allow the non-mapmerged map changes this once, but not again. Regardless, this cannot be merged until all requested changes are resolved, excluding the mapmerge one.

JakeDaBoss commented 8 years ago

It won't be squashed. I'll take a look at the rest.

JakeDaBoss commented 8 years ago

@BlueNexus just merge it. I'm not squashing it, considering my commits can't be squashed.

BlueNexus commented 8 years ago

@jakedaboss I can't merge it while there are outstanding requested changes.

JakeDaBoss commented 8 years ago

Which are @bluenexus