search

zorkian / nagios-api

A REST-like, JSON interface to Nagios
BSD 3-Clause "New" or "Revised" License
586 stars 173 forks source link

add info on compability-issues #25

Closed Finkregh closed 11 years ago

Finkregh commented 11 years ago

also see my comment in #12

Finkregh commented 11 years ago

ugh, how do i merge pull-requests?

zorkian commented 11 years ago

You don't -- I have to. :-) Thanks!

Finkregh commented 11 years ago

(erm, how do i merge these two pull-requests into one) :+1:

zorkian commented 11 years ago

Well, I've already merged the two into the upstream so it's no longer relevant. For future note though, you'd have to close the pull requests and squash your two commits into one. Check out:

http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html

Finkregh commented 11 years ago

thx, i just thought that it might be possible to do that via this schnazzy github-website where i just klicked a few buttons, added these two lines on the inline-editor and bäm we have pull request. oh, we have two, maybe we can merge these... ;)

(i rebase all day long on CLI, so... :-))

zorkian commented 11 years ago

Sadly, no, they don't really do much rebasing in the snazzy UI. :)