atlassian-sourcetree

.gitignore doesn't ignore files

夙愿已清 提交于 2019-11-28 17:14:32
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 application/config/config.php application/config/database.php user@host ~/workdir % The files are in

Authentication failed to bitbucket

烈酒焚心 提交于 2019-11-28 16:37:16
I'm trying to push my project via the https protocol on bitbucket using sourcetree. But I can't connect to bitbucket with my login and password (which work on the website), I have a fatal error : "Authentication failed". I read on other posts I can work around the problem using the ssh protocol instead of the https one, so I set up a ssh key following instructions on the source tree faq . But now I don't know how I can change to the ssh protocol when I want to push my code. Someone know how I can do this ? Thank you. If you got authentication issues with the GIT console you can try your auth

How do I ignore all files in a folder with a Git repository in Sourcetree?

こ雲淡風輕ζ 提交于 2019-11-28 16:36:53
I have a Bitbucket Git repository managed with Sourcetree. I have two folders that I want to commit, but I need to ignore all the files in these folders, because they contain only temporary files. How can I do that? Add this to .gitignore: * !.gitignore Kalzem For Sourcetree users: If you want to ignore a specific folder, just select a file from this folder, right-click on it and do "Ignore...". You will have a pop-up menu where you can ignore "Ignore everything beneath: <YOUR UNWANTED FOLDER>" If you have the "Ignore" option greyed out, you have to select the "Stop Tracking" option. After

Removing/undoing a merge on Sourcetree

|▌冷眼眸甩不掉的悲伤 提交于 2019-11-28 16:04:44
I made quite few changes in my project (I was working on a remote branch and not the master), I committed them and created a pull request on BitBucket and merged the branch to master. I had forgotten to push my changes after the commit. Now, after trying switching the current branch to my remote branch and reverting to the commit before the merge, I managed to get all my changes back and back them up elsewhere in my system. What I want to do now is undo the bad merge that I did. Each time I click on the merge and select "Reverse commit", I get the following error message: "error: Commit is a

Sourcetree - undo unpushed commits

白昼怎懂夜的黑 提交于 2019-11-28 13:21:51
问题 I am using Sourcetree for Windows for a git-repository and would like to undo an unpushed commit. Is that possible? If I do "revert commit", it creates a second commit which reverts the first commit, but I don't want the first commit to appear at all in my source control. I could also delete my local repository and pull it again without my local commit, but maybe there's another way? 回答1: Right click on the commit you like to reset to (not the one you like to delete!) Select "Reset master to

Remove weird 'Iconr' file from the repository

家住魔仙堡 提交于 2019-11-28 06:49:01
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 git completely forget about that file? VonC It is best to revert to the command line in order to have

Bring gh-pages up to date with the latest commit of master

廉价感情. 提交于 2019-11-28 06:09:34
问题 I am using SourceTree in combination with a Github repository for version control for a project. For a while, I've been using master to commit all new changes, but every now and then, I want the gh-pages branch to fast-forward to the latest commit of master , so that I can update the live page with the page I have in production (usually when a major update is finished). I have tried rebasing, as another SO post suggested, but this made the problem even worse, as SourceTree had me manually

Bitbucket access keys can only be used for read-only?

十年热恋 提交于 2019-11-28 05:23:12
问题 First time using bitbucket, trying to make a first push of my local project to bitbucket. I managed to create a repository with no issues. After I created a new SSH Key, which I loaded to both Bitbucket and also Pagent (that is running in my windows background). Still when I try to push my commit to Bitbucket I get the following: git -c diff.mnemonicprefix=false -c core.quotepath=false push -v --tags --set-upstream origin master:master Pushing to user@bitbucket.user/repository.git repository

SourceTree App says uncommitted changes even for newly-cloned repository - what could be wrong?

蓝咒 提交于 2019-11-28 03:48:51
A remote git repository is just cloned to a local box using Atlassian SourceTree . Even no files have really been modified in the work tree, Atlassian lists a bunch of files right away under "Uncommitted changes". Each file shows same line count both as removed and added, and this count equals to the total count of lines in the file. This would somehow give a hint that we're hitting some kind of line ending problem. However, the repository's .gitattribute contains # Set default behaviour, in case users don't have core.autocrlf set. * text=auto that per GitHub article Dealing with Line Endings

Edit a commit message in SourceTree Windows (already pushed to remote)

可紊 提交于 2019-11-28 02:32:35
How do I edit an incorrect commit message in SourceTree without touching the command line? Additional details: This is not the latest commit. Everything was already pushed to Bitbucket. This is a private repository and I am the only collaborator. I don't mind losing any of the previous commits, as I can re-commit them anytime. I don't want however to lose any code modification ever made. Outcome: As it seems impossible at the moment according to your comments and replies, I'm going to create a new repository and start all over. Thanks all for your help! Here are the steps to edit the commit