private int mLastX; private int mLastY; public View.OnTouchListener onTouchListener = new View.OnTouchListener() { @Override public boolean onTouch(View view, MotionEvent ev) { Log.e("InvParent", "--------v.getParent().getParent().getParent…
git merge git pull时候遇到冲突解决办法git stash https://www.cnblogs.com/juandx/p/5362723.html 在使用git pull代码时,经常会碰到有冲突的情况,提示如下信息: error: Your local changes to 'c/environ.c' would be overwritten by merge. Aborting. Please, commit your changes or stash them befor…