摘要:
error: Your local changes to the following files would be overwritten by merge: xxx/xxx/xxx.java Please, commit your changes or stash them before you 阅读全文
摘要:
List<Object> list = new ArrayList<String>(); //报错 因为List源码是用泛型写的 代码中我们规定了List集合中的泛型是Object,那么List中所有使用的到该泛型的都已经是Object类型的数据了。那么实现类中重写的方法,此时也已经确定了这个数据类 阅读全文
摘要:
$ Git push -u origin master To git@github.com:**/Demo.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to ‘git@git 阅读全文