I am facing a problem using SourceTree to Push and Pull from Github.
When I try to pull I receive this error.
git -c diff.mnemonicprefix=false -c core.quotepath=false fetch origin
git -c diff.mnemonicprefix=false -c core.quotepath=false pull origin develop
From https://github.com/yesol1108/CSCI-150_team-3
branch develop -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
LoanApp/gradle/wrapper/gradle-wrapper.properties
PaypaPayment/.idea/modules.xml
Please commit your changes or stash them before you merge.
error: Your local changes to the following files would be overwritten by merge:
LoanApp/app/src/main/java/com/example/team3/csci150/loanapp/TCPServer.java
php/find_pswd.php
Please commit your changes or stash them before you merge.
Aborting
When I try to push, I receive this error:
git -c diff.mnemonicprefix=false -c core.quotepath=false push -v --tags --set-upstream origin NewBranch:develop
Pushing to https://github.com/yesol1108/CSCI-150_team-3.git
To https://github.com/yesol1108/CSCI-150_team-3.git
! [rejected] NewBranch -> develop (non-fast-forward)
error: failed to push some refs to 'https://github.com/yesol1108/CSCI-150_team-3.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
I am really afraid to push or pull anything, if anything have any suggestion. I would appreciate it. I'm afraid to lose information locally and remotely.
I am facing a problem using SourceTree to Push and Pull from Github. When I try to pull I receive this error.
When I try to push, I receive this error:
I am really afraid to push or pull anything, if anything have any suggestion. I would appreciate it. I'm afraid to lose information locally and remotely.