atlassian-sourcetree

Can't push feature branch in git, doesn't exist in remote?

a 夏天 提交于 2019-12-11 04:06:30
问题 I created a feature branch off of develop. It looks like this: Previously when I made a feature branch, it also showed up on the remote, but now it's not present. Now, when I try to push in SourceTree, I get the following error: To https://myname-mycompany@bitbucket.org/mycompany/projectname.git ! [remote rejected] feature/data_utilities -> feature/data_utilities (failed to write) error: failed to push some refs to 'https://myname-mycompany@bitbucket.org/mycompany/projectname.git' I also

How to prevent git commit if specific phrase in changes is detected?

大憨熊 提交于 2019-12-11 03:05:29
问题 I noticed some patterns, that developers tend to do - like committing javascript tests with fdescribe or fit left in them (which means only one test/suite will be running), usually that is found in review phase, but it would be nice to catch those small things earlier. Wondering if there is a way to configure git to prevent commit if some pattern is detected within the changes? 回答1: That's a classical job for git commit hooks ( man githooks ); for example, from the standard script samples

Single directory pointing to multiple git repositories

时光总嘲笑我的痴心妄想 提交于 2019-12-11 02:27:41
问题 I am working in software vendor company. My team needs to submit code to client's git repository and we conduct code review prior submitting code in which we will have all the comments and code correction.To setup this flow, I want to point parent project directory to multiple git repositories How can I set up two git repositories in the same directory on osx. I am using sourcetree as git tool 回答1: You can set up multiple push URLs to a single remote. Origin is default remote in a git project

how to add remote repository using sourcetree

梦想的初衷 提交于 2019-12-10 16:38:33
问题 I'm using a Mac and I'm new to bitbucket and sourcetree. I want to push my local repository to a remote repository. So in sourcetree, I pressed "New", "clone from Url" and I pasted the url right from our remote repository. When I press enter, it says the url isn't valid. I kinda rushed through the installation, so maybe that could be it. 回答1: I'm assuming your local folder is initialized with git . There are two ways you can achieve this: Via Sourcetree app: In Sourcetree, check the left pane

SourceTree not working after Windows 10 Fall Creators Update

删除回忆录丶 提交于 2019-12-10 15:43:00
问题 After install Windows 10 Fall Creators Update, sourcetree stop working. When I try to open nothing happens. I've already try to reinstall but no success. 回答1: It was a bug! Affects Version/s: 2.2.4.0, 2.3.1.0 They released version 2.3.5.0 which includes a fix for this issue. You can download it here: https://downloads.atlassian.com/software/sourcetree/windows/ga/SourceTreeSetup-2.3.5.0.exe 来源: https://stackoverflow.com/questions/46847809/sourcetree-not-working-after-windows-10-fall-creators

How to REALLY remove a tag on git / SourceTree

試著忘記壹切 提交于 2019-12-10 13:41:29
问题 I know how to delete a tag from SourceTree. Just right-click, delete, and tick "remove tag from all remotes." It then executes the following (and I'm omitting the flags -c diff.mnemonicprefix=false -c core.quotepath=false for readability): git tag -d my_tag git push -v origin :refs/tags/my_tag This works. Here is the problem. Some time later, one of the other developers will push their feature branch to origin, and SourceTree will automatically push all local tags to the remote server. This

Sourcetree 2.1.2.5 - Shows “Uncommitted changes” yet nothing is pending

喜欢而已 提交于 2019-12-10 13:18:28
问题 I have a problem that I have not been experienced before. Even though I have nothing to commit and have tried to reset my branch to the latest commit Sourcetree shows Uncommitted changes . According to the Atlassian forums there is usually two reasons: You have many, many unstaged files in your working directory that get listed in SourceTree. This causes Git/Hg to take quite some time going through all the files, and so SourceTree waits on Git/Hg to report back. - Tried hard reset so any

How to move branch from one repository to another branch of different repository

你离开我真会死。 提交于 2019-12-10 10:18:09
问题 I created a new Repository (named repoN) with the existing one (named repoE), simply by copying code from the branch (named B22). After that, I created a new branch in repoN (named BR01). Now I made some changes in the branch (named BR01) which exist in repoN repository. I just want to take all those changes into the old repository repoE without loosing history of BR01 into B22. I am using SourceTree because I'm new in Git and don't know much commands. 回答1: At first you need to add to git

SourceTree filemerge quits immediately and creates 4 files. How to fix it?

萝らか妹 提交于 2019-12-09 18:01:12
问题 yesterday I could merge files in sourcetree with the external tool filemerge. Today, sourcetree wanted me to register me, and after my successful registration, I couldnt start filemerge. When I choose "Launch external diff tool" from the contextmenu of a file, 4 files appear (Backup, base, local and remote) but filemerge quits immediately. When I launch external diff, filemerge displays in the left /dev/null as source. How can I fix it? In preferences I choose filemerge as external diff tool.

How to make an existing branch track a remote branch?

只愿长相守 提交于 2019-12-09 15:29:07
问题 I'm trying to track an exiting branch to a remote branch using --track or --set-upstream-to , but got the following error $ git branch --track master origin/master fatal: A branch named 'master' already exists. $ git branch --set-upstream-to master origin/master fatal: branch 'origin/master' does not exist I checked SourceTree and found that it uses --set-upstream , but got the following warning $ git branch --set-upstream master origin/master The --set-upstream flag is deprecated and will be