Closed skonto closed 9 years ago
i will have to rebase for this...
In cfg.sh
, only one of the methods is used. Unused code becomes fast "legacy" code.
Also the function get_number_of_slaves
should be used. It would remove the requirement to specify both --number-of-slaves
and --slaves-cfg-file
, and reduce the risks of misconfigurations.
A few comments, but otherwise it seems to work fine.
re-based it needs a few mods to fix issues...
You should really use the git rebase
command, instead of git merge
.
Basically:
git rebase
to 'squash' commits.git rebase master
push --force
the result on your remote branch for review.i did that its just the push force which makes the difference...
LGTM. You can squash and merge :smiley:
i think all is in one place now.. :) check and merge pls...
:+1: good to merge
Not anymore. Guys, if there's an LGTM please merge, there's no reason to wait and get into this sort of issues.
but now have to resolve conflicts again :(
Exactly! That's why it makes no sense to drag these PRs as 'open' once they have been LGTM'd. :) Sorry about that.