Questions tagged [sourcetree]

SourceTree is a free Mercurial and Git Client for Windows and Mac that provides a graphical interface to connect with Git and HF services.

SourceTree is a product of Atlassian. It is a free Mercurial and Git Client for Windows and Mac.

It supports Butbucket, GitHub, Kiln and other Git and HF services as well.

226 questions
18
votes
7 answers

How to remove a file from Git Pull Request

I have a pull request opened where I have some project.lock.json files which I do not want to merge while merging my branch to main branch. Is there a way to remove thos project.lock.json files from my Pull Request?
tavier
  • 1,744
  • 4
  • 24
  • 53
16
votes
3 answers

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

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…
user2380509
  • 161
  • 1
  • 1
  • 7
16
votes
6 answers

How to squash commits on Bitbucket after they have been pushed?

I am currently working on a project with multiple others. The problem is that we created a fork of an existed project and need to squash all our commits from after the forking process to a single commit for a pull-request on Bitbucket. Is there any…
Joshua
  • 303
  • 1
  • 2
  • 11
15
votes
3 answers

How to check if a commit has been merged to my current branch - somewhere in time?

I have a random feature/XXXXXXX branch that has some commits and naturally the "develop" branch where those features are eventually merged. How do I check if a certain old commit (e.g. commit ab123456 from branch feature/user-registration) has been…
Dzhuneyt
  • 8,437
  • 14
  • 64
  • 118
13
votes
2 answers

How to integrate visual conflict resolution (P4Merge) into SourceTree

For quite some time now, I have been bedeviled by SourceTree's lack of usable conflict resolution. There is supposed to be a procedure for integrating p4Merge or some other diff/merge tool into SourceTree. For the moment, p4Merge is my tool of…
Robert Harvey
  • 178,213
  • 47
  • 333
  • 501
12
votes
1 answer

What's ignoring the gradle wrapper?

The setup New intellij install, new sourcetree installation, new android project, .gitignore has been initialized as: *.iml .gradle /local.properties /.idea/workspace.xml /.idea/libraries .DS_Store /build /captures The problem The files in the…
weston
  • 54,145
  • 21
  • 145
  • 203
12
votes
4 answers

How to use .jar tool BFG Repo Cleaner and reduce git repository?

I have a question that I am sure is very simple but which I can't find the answer for. I am an animator working on the Unreal Engine 4 and using Source Control, Bitbucket and Source Tree to collaborate on a current project. My coding expertise draws…
user3389654
  • 141
  • 2
  • 5
12
votes
6 answers

Cloning stuck on checking source

I'm using sourcetree and I plan to clone a repository from our github but my sourcetree got stuck on "checking source" I wonder whats the problem and how could I resolve it. I already tried using the embedded git but still it does not work
bleyk
  • 799
  • 3
  • 14
  • 41
11
votes
2 answers

I can't stop tracking files in source Tree

I added to my repository files that I don't want to track now. I don't want them to appear in this pending files window but I don't wont to delete them from the project. The problem is that I don't know how to fix it. I tried everything. I even…
Przemek
  • 647
  • 2
  • 8
  • 25
11
votes
7 answers

Unable to create '/git/index.lock': File exists - but it doesn't

I'm getting this message when trying to rebase interactively using source tree. If no other git process is currently running, this probably means a git process crashed in this repository earlier. Make sure no other git process is running and remove…
Manza
  • 3,427
  • 4
  • 36
  • 57
11
votes
1 answer

How to REALLY remove a tag on git / SourceTree

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…
Peet Brits
  • 2,911
  • 1
  • 31
  • 47
10
votes
2 answers

SourceTree: Keeps asking for a password to bitbucket.org

Can't connect to bitbucket.org from SourceTree. Keeps asking for password. Worked fine yesterday with the same project. Works from git command line
Jakob Majkilde
  • 227
  • 2
  • 9
9
votes
3 answers

SourceTree external merge stopped working

Ive been using tortoiseMerge as external tool in source tree for a while now but today I had 3 conflicts after pull, so I fixed the first one then I wanna open the next and window pops up saying Visual merge in progress, but nothing happens,…
Honza
  • 323
  • 3
  • 14
9
votes
1 answer

How do you revert with sourcetree?

What is the process to revert back to a previous commit if you are using sourcetree? Please no command line help, I understand how you would achieve the same result there but am specifically looking to do it with my friendly atlassian tool.
AMAN77
  • 6,218
  • 9
  • 45
  • 60
9
votes
4 answers

Cannot login to SourceTree

My company has a Bitbucket account with Atlassian. I've downloaded the latest update to Sourcetree; when I try and login my credentials are not accepted. The same happens if I access this page through my web browser here:…
garryp
  • 5,508
  • 1
  • 29
  • 41
1
2
3
15 16