atlassian-sourcetree

问题 In Atlassian SourceTree, how to know which tags are only local and which are also in remote? When creating a tag you get the option "Push tag to: ...", but how to know if a tag has been pushed or not after it is created? I can see all my tags locally, but I need to be sure that they are present in remote so that other developers can pull them. 回答1: Even without cloning or fetching, you can check the list of tags on the upstream repo with git ls-remote: git ls-remote --tags /url/to/upstream

问题 I am working on a maven project and I want to ignore the files generated and stored in the /target folder of my project (Evaluation) root folder.In the root of my git repository I have a .gitignore file with the following entries (backend is just a folder which contains the eclipse project Evaluation) backend/Evaluation/logs/ backend/Evaluation/target/ For some reason SourceTree does not ignore the files stored in these two folders and when I compile my project there are some uncommitted

问题 I've set up a git user on a Mac OSX 10.7 system. In the git user's root, I've created a repositories folder and initialized a bare git repo named test . So far so good. Now, I clone the repo from a PC on the same network as the Mac with git clone git@mac:repositories/test.git This succeeds. I can then, push and pull from this repo. All looks good. But, when trying to do the same thing with Atlassian SourceTree - a GUI git client - this fails : This is not a valid source path / URL Anyone an

问题 I'm using SourceTree together with TortoiseDiff/Merge. Every time I save a file there, after resolving all conflicts, SourceTree handles everything perfectly, except for the fact, that it always create a backup file [name].orig . This is extremely irritating for me, as I have to Ctrl + Del such file each time and confirm annoying dialogs. How can I get rid of this? I thought, that this will be as simple as unchecking Tools > Options > Keep backups on destrictive operations . But, apparently

问题 When trying to commit after a merge I'm getting this error message: "fatal: You are in the middle of a merge -- cannot amend." How do i resolve this? as far as I know I have resolved all conflicts, i just need to complete the merge and commit the changes. but the product won't let me and doesn't give me any clues as to what I am meant to do next, and there is no option to "complete the merge" Everytime I try to commit my changes I get the error message and I now have no idea what to do about

问题 The interactive rebase capabilities of Sourcetree are great, but I often find myself wanting to be able to "split" a commit into multiple smaller commits. I know theres a way to do this from the command line, but I can't seem to find any place in the UI to handle this. Is there a way to do this with Sourcetree? Or is this one of those places where I have to drop down to the command line to accomplish my goals? 回答1: Splitting the commits from the command line using interactive rebase is

问题 I'm new to the Git environment, and I'm using BitBucket with SourceTree on Mac. All I want to do now is to discard the changes since last commit. How should I do this? I haven't found anything like "discard changes", and directly pulling from the last commit doesn't seem to work. Solutions done with either the GUI or command line will be good. Thank you. 回答1: I like to use git stash This stores all uncommitted changes in the stash. If you want to discard these changes later just git stash

问题 I'm using (Windows) SourceTree for my git project. I can do it in either command prompt or Linux terminal. But, I'm wondering whether there is a nice way to interactively and visually resolve conflicts. For example, if pull detects conflicts, popping up a GUI-based conflict tool (e.g., P4Merge). Is it possible? I am always doing manual conflict resolving, which is just painful. This is, for example, a git pull message, from SourceTree. git -c diff.mnemonicprefix=false -c core.quotepath=false

问题 My .gitignore file gets ignored and the files which should be ignored are still visible. user@host ~/workdir % git status # On branch master # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: .htaccess # modified: application/controllers/statistics.php # no changes added to commit (use "git add" and/or "git commit -a") user@host ~/workdir % cat .gitignore .htaccess

问题 In my git repository I've got a weird file in the staging area that's refusing to be reverted, removed, committed - basically I can't make it go away .. The file must be some ancient OS 9 file sitting there in the folder for years. Couple days ago I've removed the file in the file system so now git is tracking the deletion of Iconr . However, it's stuck there. The error I'm getting via SourceTree (my git UI client) is fatal: pathspec 'folder/Iconr' did not match any files Any idea how to make