atlassian-sourcetree

问题 So I make my file changes, but when I try to push them source tree complains that some one else pushed before me.The files are different,yet I am forced to merge the changes. Some times I have to backup and reset my workspace before it can allow me to push again Is there no way to force the push? 回答1: Open SourceTree Preferences Tab: Advanced Third checkbox: Allow force push Enable the checkbox and close Preferences. Next time you push, there will be an extra checkbox: Force push . Checking

问题 I'm trying to use the latest version SourceTree with a Google Code project that uses Git. The problem is that when I try pushing the changes, it complains about authentication: git push -v --tags --set-upstream origin master:master Pushing to [project] fatal: remote error: Invalid username/password. You may need to use your generated googlecode.com password; see https://code.google.com/hosting/settings Completed with errors, see above I can't see a place to enter in a password anywhere in the

问题 SO I followed the instructions from here and tried to set up a merge for scenes in unity. The instructions about SourceTree are right at the bottom. I added the merge tool provided by unity as a custom merge tool, but when I try to merge a branch that changed the scene into my branch I get a conflict and the merge fails. I'm a total noob at this thing and don't know what to do now. Is it possible to make it automatic or I have to write some stuff in the terminal and if I do what should I

问题 I'm looking to use git subtree to use a framework repo that I own in my project repo. This should look like this: project Some stuff Some stuff framework Using Sourcetree app for windows I made the following: Clone project Add Subtree framework in a folder named framework Add test.txt in framework That leads me to something like this: project Some stuff Some stuff framework test.txt Sourcetree then tells me that test.txt is not staged for commit so I add it and commit it. I might be using it

问题 I committed files that I don't want to push. I didn't push yet. How can I remove the commit? This is how my screen looks: These are the options: I don't want to undo any changes to the source code! 回答1: To remove the commit without changing any source code, you need to perform a "mixed" reset. Right click on the last "good" commit (this will probably be origin/master ). Select "Reset current branch to this commit." In the resulting dialog, select "Mixed..." from the drop down and click OK.

问题 I made an initial push to GitHub from our codebase but one of the two websites sub directory didn't get pushed for some reason. We had .git files in both sub directories but removed them prior to making this new combined repository. We've tried adding a single file to the sub directory but SourceTree isn't seeing picking up the changes. How would you add those subfolders? 回答1: We had .git files in both sub directories but removed them prior to making this new combined repository. It is not

问题 I am managing project of Unity (ver 4.6.3) with sourceTree 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. After that, I tried to push, but I failed to push. Sorry, I forgot to take the error at that time. After 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. Although I was

问题 I have installed GitLab 6.0 on a linux box and created a number of projects. I can create a local clone of each project using the SSH URL, but when I try to use the HTTP URL I get a 504 Gateway Timeout within seconds . When I paste the HTTP URL into SourceTree it says "Checking source" for a second or so, then "This is not a valid source path / URL". When I click on "Details..." it says: The requested URL returned error: 504 while accessing http://myserver/group/project.git/info/refs Git Gui

问题 Is there a way that I can set on Mac the Visual Studio Code as the default diff/merge tool in SourceTree? Thank you in advance. 回答1: According to the docs I found, SourceTree just uses whatever you've configured your git repo to use. You can configure your git repo to use VS Code with the git config command like so: git config --global core.editor "code --wait" However, you must configure VS Code to launch from the terminal before this will work. See this blog for more info. 回答2: I found this

问题 Our BitBucket repo has grown to over 3 gigs and now when I try to clone in SourceTree all I get is the trying to connect symbol. When I try in Tortoise it clones to a certain point then disconnects saying it expected # bytes but got #. I can't download the .zip from BitBucket because it's too large. What can I do to clone? 回答1: Clone to an old revision, using hg clone -r <revision> , and pull the rest. You can also pull progressively, if necessary. 回答2: I also experienced this problem with a