atlassian-sourcetree

SourceTree - rebase - Errors During Merge

早过忘川 提交于 2020-05-14 15:36:56
问题 I'm trying to do something simple like editing the commit message for a previous commit. Checking git status I have: nothing to commit, working directory clean I then click on the commit and do SourceTree > Repository > Interactive Rebase... but get this dialog box, and a completely blank/empty description area: Note: I read somewhere that this might be due to FileMerge creating a .orig backup file. However, looking through FileMerge preferences I don't see anything about backup files 回答1:

SourceTree - rebase - Errors During Merge

北慕城南 提交于 2020-05-14 15:36:48
问题 I'm trying to do something simple like editing the commit message for a previous commit. Checking git status I have: nothing to commit, working directory clean I then click on the commit and do SourceTree > Repository > Interactive Rebase... but get this dialog box, and a completely blank/empty description area: Note: I read somewhere that this might be due to FileMerge creating a .orig backup file. However, looking through FileMerge preferences I don't see anything about backup files 回答1:

SourceTree - rebase - Errors During Merge

不羁的心 提交于 2020-05-14 15:36:27
问题 I'm trying to do something simple like editing the commit message for a previous commit. Checking git status I have: nothing to commit, working directory clean I then click on the commit and do SourceTree > Repository > Interactive Rebase... but get this dialog box, and a completely blank/empty description area: Note: I read somewhere that this might be due to FileMerge creating a .orig backup file. However, looking through FileMerge preferences I don't see anything about backup files 回答1:

Reverting push to remote with sourcetree

北慕城南 提交于 2020-05-10 03:45:06
问题 I accidently pushed a feature branch to the remote master. Now I want to revert the master to the previous commit. When I select 'Revert current branch to this commit' only the local branch is reverted, and because the remote master is 55 ahead (accidental push) I cannot push the just reverted local master to the remote. When looking into this issue on SO and Google, I found that many people use force push using the command line. But since I'm using Source Tree I'd like to come up with a way

“Updates were rejected because the tag already exists” when attempting to push in SourceTree

橙三吉。 提交于 2020-05-09 17:39:44
问题 When attempting to Push via Source Tree, I get the following error: git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree push -v --tags origin refs/heads/master:refs/heads/master Pushing to https://user@github.com/repo.git To https://user@github.com/repo.git = [up to date] master -> master ... ! [rejected] example_tag -> example_tag (already exists) updating local tracking ref 'refs/remotes/origin/master' error: failed to push some refs to 'https://user

“Updates were rejected because the tag already exists” when attempting to push in SourceTree

落爺英雄遲暮 提交于 2020-05-09 17:39:05
问题 When attempting to Push via Source Tree, I get the following error: git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree push -v --tags origin refs/heads/master:refs/heads/master Pushing to https://user@github.com/repo.git To https://user@github.com/repo.git = [up to date] master -> master ... ! [rejected] example_tag -> example_tag (already exists) updating local tracking ref 'refs/remotes/origin/master' error: failed to push some refs to 'https://user

git - apply a commit on another branch to the working copy

本小妞迷上赌 提交于 2020-04-07 12:04:11
问题 so I have a commit that has a helpful code change, but on another branch. I would like to apply this commit in the other branch to my working copy on my current branch (not as another commit). Is this possible? How would I do this? Thought I'd share this is related to my previous question but specific to working copy: git cherry picking one commit to another branch 回答1: How to add the desired commit(s) into different branches. git cherry-pick <SHA-1>...<SHA-1> --no-commit Apply the change

Failed to connect SourceTree to AWS CodeCommit

不打扰是莪最后的温柔 提交于 2020-01-24 08:47:09
问题 I'm using Atlassian's SourceTree to work with git on Mac OS, and choose AWS CodeCommit as the remote hosting server. Following these steps for HTTPs connection between AWS and my local repo, here's how my git config --global --edit looks like: Then try to clone a created empty repo from AWS to SourceTree: And I get error printed out: abort: HTTP Error 403: Forbidden aws --profile default codecommit credential-helper $@ get: aws: command not found fatal: unable to access 'https://git

Difference between checkout existing and checkout new branch in Sourcetree

老子叫甜甜 提交于 2020-01-23 18:20:33
问题 In sourcetree I would like to just check out to the remote develop branch so I can start a new feature branch in there. I'm currently in another feature branch in which I have committed and pushed all my changes. However when I right click on remote branch origin/develop I get this: For some reason I can find nowhere what is the difference here. I don't want to break the repo at my new job, so I'm super careful. In GitKraken you just checkout to remote and update your local develop branch if

How to convert mercurial repository to git repository without losing branches?

不羁岁月 提交于 2020-01-19 17:09:48
问题 I want to convert mercurial repo to git repo. Actually I did but I didnt see branches. After I converted repo I can see just one branch(as master) I cannot see any other branches but I can see history(all changes) as right. when clicked any commits I can see like this information : Date: 19 Nisan 2019 Cuma 15:14:37 Committer: sevgi.cakmak Change dialog header --HG-- branch : sevgi-2.0.0 but I cannot see sevgi-2.0.0 branch on the left side (I am using sourcetree). My steps: mercurial.ini file: