And you cannot pull as you are still in the middle of a merge and you cannot start a second merge while merging. ![]() Alternatively, if these file have Windows style (CRLF) endings, and you are on mac or linux, you may want to run. You cannot push as there are commits on master you dont have in your to-be-pushed branch unless you force the push and thus throw away the commits in the remote. If you pulled files or cloned just before this happened, you may want to to change tocrlf and start over. It sounds like you are wanting to do a hard reset - effectively delete the merge with master that happened. Is there a file that needs to be deleted? If you know answer, please let me know. This is sometimes a symptom of line ending differences between systems. Hint: See the 'Note about fast-forwards' in 'git push -help' for details. But you can use the reverse commit functionality (right click on the commit and select Reverse Commit). Hint: Updates were rejected because the tip of your current branch is behind ! master -> master (non-fast-forward)Įrror: failed to push some refs to 'my remote repository' ![]() The error at that time is here git -c diff.mnemonicprefix=false -c core.quotepath=false push -v -tags Push changes from a local repository to a remote repository. To remove a file from staging, clear the checkbox next to the staged file. Click Commit at the bottom of the window. Some of the repositories work only with Embedded and some of them only with System Git version. ![]() Sorry, I forgot to take the error at that time.Īfter that, I thought that I could not push as it was, so I created another remote repository, moved my Unity project there and committed it.Īlthough I was able to commit, I could not push it. Select the files to commit in the Pending files panel. I am now using 3.0.8 and I need to switch between Embedded and System Git version inside SourceTree settings depending on the repository. I just wanted to return to the previous commit, right click to select "Reset current branch to this commit", select "Hard" in the using mode, and put it back to the previous commit.Īfter that, I tried to push, but I failed to push. I am managing project of Unity (ver 4.6.3) with sourceTree
0 Comments
Leave a Reply. |