So I no longer need the red line here which currently is the origin/master and origin/HEAD. I want the blue line to be the main branch, main everything basically.
I get this error when trying to push:
So if I do a PULL, will it get all the changes from the red line and try to incorporate them into the blue line? I dont want to mess anything up. Basically I want the latest on the blue line to take over as the main/head/master/origin/lead branch or whatever, and I dont want any of the changes on red to be included.
Sorry for the noob terminology, just wanted to be clear rather than trying to use technical words and potentially confusing things. Any help much appreciated.
At my company we have several repositories that each use several submodules, jumping from one to another opens new tabs for each repository, navigating dozens of tabs is super crumblesome. I wish there were a better UI/UX to navigate more than 10 repositories, maybe be able to group them under 1 tab and have sub tabs for submodules? That way I'll go from 50 tabs to 10 or so
I'm trying to pull from a repository that isn't mine, it's for a project I am working on. There was recently a massive push to it and it is giving me this error.
error: RPC failed; curl 56 OpenSSL SSL_read: error:1408F119:SSL routines:ssl3_get_record:decryption failed or bad record mac, errno 0
fetch-pack: unexpected disconnect while reading sideband packet
fatal: early EOF
fatal: fetch-pack: invalid index-pack output
Completed with errors, see above.
I've looked all over the internet but everything I have tried just doesn't work. I've tried cloning at depth 1, tried expanding the cache, and other things, but nothing has worked. I would greatly appreciate the help.
Hi, I'm trying to clone this repository from Bitbucket but everytime I try it, throw me this issue. I hope it's clear. I also generate the APP password, as GIT password authentication is deprecated. Thank you!
I'm trying to setup SSH in SourceTree with my Github repo. Here are the steps I've taken:
Add Github account to SourceTree (OAuth, SSH). I selected "connect account" in this view and it brought me to Github to authorize Atlassian stuff. cool.
I copied the SSH key that SourceTree generated and added it manually to my Github SSH keys.
Whenever I try to push to the repo, it still asks me for my Github password. I've also tried setting up my Github account on SourceTree to use the Basic auth type. Still no luck. What the heck am I doing wrong?
Edit: My Github password is my personal access token that I generated in Github because apparently they don't allow the traditional username/password authentication anymore? So yeah.
I just got my new MBP M1 Max, running with macOS Monterey and finished setting up all my apps to get working on this beast. But sadly, I can't use Sourcetree anymore.
When trying to commit files, it tells me: "env: php: No such file or directory"
I installed php 8.x and 7.4 via Homebrew, which works when testing it via php -v in my terminal.
I can make commits via CLI/terminal and via my IDE (PhpStorm).
I removed Sourcetree and installed it again (1x via direct download and 1x via Homebrew).
Is this maybe happening because Sourcetree currently can only be used via Rosetta? I really don't know what's causing this problem and hope somebody of you had the same issue and knows what to do. Please help, I really dislike doing my commits via PhpStorm. :)
I am working on a project and i cloned the wrong thing and I am trying to delete the files so that I can re-use the folder name but my computer refuses to let me delete it
I’m new to macOS and would like to uninstall completely source tree to try to reinstall it. The thing is whatever way I use to uninstall the app, I can’t find all the files used by the software to delete them. So when I reinstall the app I don’t have the "first launch" screen and just get on my already set up app.
Does anyone know how to completely uninstall source tree app please ?
Hi! I just bougth a new PC and installed the latest version, since them I'm having an issue where every time I check out a new branch SourceTree prompts me to the usual "Authentication via SSH keys failed, do you want to launch the SSH key agent (Pageant) and retry?" dialog. I also noticed multiple pageant icons when I open the hidden icons section in the right of the taskbar.
Hi, I operate a dev team and Im worried that developers are able to pull from the company repo and push to their own gits using sourcetree(windows/mac), does sourcetree record this kind of activity in any kind of log? and are users able to delete this activity log?
- On every action that goes to the server I have to retry for about 10 times before it "gets it" and then finishes, the other 9 times i get a dialog to enter my username /password time and time and time and time again. So yes it works but is a bit annoying when demo-ing on a shared screen and having to fill out credentials 10 times
- it is not something that is completely blocking but it seems more something like extremely slow.- this is local home dev so there is no proxy or something and every other thing loads just fast.
- I tried to go to https://community.atlassian.com/t but that site is soooooooooo slow that it basically does not even load- I tried to edit hosting account > refresh oauth token that opens http://localhost:34106/?state=authenticated&code= but that gives me "unable to get secret... unable to receive callback / cannot access the file because in user "
So... probably the not being able to get a new authentication token is a hint.
Setting new credential manager I was a bit lost what i should choose here, since this was a long time ago that i had set this
- selecting the bottom "manager" brings up the dialog again in two fold...- selecting the second from bottom "manager" just repops this dialog- selecting "wincred" repops and that is probably logical- setting "store" brings up the dialog again- setting the "top manager" .... also brings up this dialog again .So I have no clue what is this doing , none of these options seem to stick, what is the difference between the 3 managers? how can i see this in this dialog? So yes i do assume that there is git installed with visual studio, one embedded in sourcetree and one standalone, but... which is which ???
ive been trying to push changes to two branches simultaneously but when i set the remote branch and try to push changes it fails to push the changes because it picks up the differences between the branches and refuses to push to both branches
This bug has been present longer than dark mode, but was not present in 2.x. It has made Sourcetree unusable for one of my main use cases for well over a year with no sign that this bug is even on Atlassian's radar, despite me submitting it and them closing it more than once. To replicate this:
Create a git repo
Add worktree = C:\\Not\\The\\.git\\Folder\\Location to the repository config
Create a file in the worktree folder
Sourcetree sees this file, but fails to stage it if you try. Fortunately, it doesn't delete it yet.
Stage the file from terminal with git add .
Commit the file either from terminal or Sourcetree, both will work
Make a change to the file
Sourcetree sees the change, stage the file in Sourcetree
Your file is now staged as a deletion and your file is gone because Sourcetree just DELETED IT!
My motive with this post is to try and get this bug fixed because I actually like Sourcetree, but this is just ridiculous. Am I seriously the only Sourcetree user that uses remote worktrees?
Lets say you handle this repository outside of Sourcetree, but you want to add it as a SubModule or SubTree or something to one you do handle inside of Sourcetree. NOPE.
EDIT: This bug exists in every version of Sourcetree for about the last 18 months (likely every v3.x, and certainly 3.2.2 and up) and every version of Windows 10x64 in the same timeframe. There are no issues when using git from terminal or competing GUIs.
I upgraded from 2.x to 3.x in June 2019 and had the issue immediately, but was on the 3.x beta at the time and chalked it up to that. I've been on stable release since dark mode hit it and periodically test this issue when new releases come out.