your local changes would be overwritten by merge. commit stash or revert them to proceed. view them
error log:your local changes would be overwritten by merge. commit stash or revert them to proceed. view them You can't merge with local modifications. Git protects yo...