Join GitHub today
GitHub is home to over 20 million developers working together to host and review code, manage projects, and build software together.
Verbose info configuration #2918
Conversation
|
GH is warning about merge conflicts. |
|
Hmm I branched off of upstream/master. How can I see those merge conflicts? |
|
make sure you rebase off current master |
|
I can deal with that if you run into troube, but it'll probably rebase without trouble. |
|
git br yourbranchname --set-upstream master if u have conflicts u will need to edit the files also u might want to rebase to 1 commit (or more) and either pick, squash, or fixup when done git push myfork yourbranch -f |
|
I see that |
|
sure, just put it in a seperate commit "CLN: ...". |
|
on second thought, better not touch those. |
|
This is the 2nd PR you've opened that needed massive surgery. Please show more I've fixed the history and pushed a tidy commit to branch On review, I see you've added an |
|
Ok. Sorry about that. I won't submit any more pull requests until I've spent some more time with git. |
|
I just realized after looking at the surrounding tests that it looks like I attempted to reinvent the wheel in |
|
Also, you should consider getting travis-ci working, that way it's easy to see whether your code actually "works" :) ...well, actually, whether it fails. Does your last comment mean you want this pull-request closed (and not merged)? |
|
@hayd I would like for this to be merged if it doesn't break anything. Will it automatically show up on Github if the Travis build passes? |
|
@cpcloud precisely, have a look at some of the other pull requests on here. (It passing won't necessarily mean it'll get merged though, but it helps :) .) |
|
@cpcloud, validators must raise You can try: In [3]: validtor=pd.core.config.is_instance_factory((int,type(None)))
In [4]: validtor(1)
In [5]: validtor(None)
In [6]: validtor(1.3)
---------------------------------------------------------------------------
ValueError Traceback (most recent call last)
<ipython-input-6-d14dc426f1c2> in <module>()
----> 1 validtor(1.3)
/home/user1/src/pandas/pandas/core/config.pyc in inner(x)
700 def inner(x):
701 if not isinstance(x, _type):
--> 702 raise ValueError("Value must be an instance of '%s'" % str(_type))
703
704 return inner
ValueError: Value must be an instance of '(<type 'int'>, <type 'NoneType'>)'Other then that I think this is fine to be merged, Not using Getting travis going would be good. You can just "git commit --amend" to fake |
cpcloud
added some commits
Feb 26, 2013
|
rebased and merged. Thanks @cpcloud. |
y-p
closed this
Mar 14, 2013
y-p
added a commit
that referenced
this pull request
Mar 29, 2013
|
|
y-p |
1957796
|
cpcloud commentedFeb 23, 2013
No description provided.