atlassian-sourcetree

sourcetree line ending issue

感情迁移 提交于 2021-02-07 18:19:11
问题 I am getting a very strange whitespace issue. I am working with a local copy of a WordPress site with the .git repo in the wp-content/themes folder so all changes to any theme are tracked etc. When I set up the repo it considered every file (apart from those in gitignore) as new files and I committed those as the 'initial commit'. Firstly is that normal? To have to commit all the files when setting up a new repo? 2nd - and this is the strange behaviour. when I go to stage these files I get

Git tip is behind of current branch, conflict

六月ゝ 毕业季﹏ 提交于 2021-01-29 10:20:08
问题 I tried to make workaround for a failing driver, but eventually it turned out that wasnt needed. but now i seam unable to push my local version to master. I'm the only one updating my branch, but when i tried to fix this, i made several versions and branches after it. I'd like to reject all other versions and go back to my (older) working local copy and push it to server. but when i do i get: git -c diff.mnemonicprefix=false -c core.quotepath=false push -v --tags hint: Updates were rejected

Git Tag failed with code 128: fatal: unterminated line in .git/packed-refs

寵の児 提交于 2021-01-18 05:35:46
问题 I am having an error in SourceTree that says, "Error Encountered: 'git tag' failed with code 128: fatal: unterminated line in .git/packed-refs" If anyone has seen this error and knows a solution I would be grateful. 回答1: Just delete the file .git/packed-refs . Then "refresh" your repo with a pull or fetch . I had the same error fatal: unterminated line in .git/packed-refs: ... (And that file was just lines of: 0000 0000 0000 0000 0000 0000 0000 0000 ) In my case deleting the file worked and I

Git Tag failed with code 128: fatal: unterminated line in .git/packed-refs

≡放荡痞女 提交于 2021-01-18 05:35:34
问题 I am having an error in SourceTree that says, "Error Encountered: 'git tag' failed with code 128: fatal: unterminated line in .git/packed-refs" If anyone has seen this error and knows a solution I would be grateful. 回答1: Just delete the file .git/packed-refs . Then "refresh" your repo with a pull or fetch . I had the same error fatal: unterminated line in .git/packed-refs: ... (And that file was just lines of: 0000 0000 0000 0000 0000 0000 0000 0000 ) In my case deleting the file worked and I

How to disable git gpg signing

旧城冷巷雨未停 提交于 2020-11-30 04:49:39
问题 I'm using git gpg signing. I want to disable it. I've set .gitconfig [user] name = NAME email = EMAIL signingkey = KEY ... [commit] gpgsign = false My commits are still signing by default. PS: I also disabled from Sourcetree Repository/ Repository Settings/Security tab. Both Sourcetree and terminal forces to use gpg. 回答1: You can disable this by running git config commit.gpgsign false This sets the configuration locally instead of globally. Putting this setting in .gitconfig worked for me

Revert local Sourcetree repo to master

天大地大妈咪最大 提交于 2020-11-29 02:58:21
问题 I'm new to Sourcetree and have created a mess locally, with 7 ahead commits compared to the origin/master. I want to ignore and remove everything I've done locally and start again by reverting my local repo to the origin/master as it currently stands. How do I do this? Remark : I know the origin/master is correct since I have another machine next to me which I don't use to do commits and just did a pull from the origin/master, and the local repo is correct on this other machine. 回答1: You can

Revert local Sourcetree repo to master

旧巷老猫 提交于 2020-11-29 02:52:34
问题 I'm new to Sourcetree and have created a mess locally, with 7 ahead commits compared to the origin/master. I want to ignore and remove everything I've done locally and start again by reverting my local repo to the origin/master as it currently stands. How do I do this? Remark : I know the origin/master is correct since I have another machine next to me which I don't use to do commits and just did a pull from the origin/master, and the local repo is correct on this other machine. 回答1: You can

Revert local Sourcetree repo to master

泪湿孤枕 提交于 2020-11-29 02:47:49
问题 I'm new to Sourcetree and have created a mess locally, with 7 ahead commits compared to the origin/master. I want to ignore and remove everything I've done locally and start again by reverting my local repo to the origin/master as it currently stands. How do I do this? Remark : I know the origin/master is correct since I have another machine next to me which I don't use to do commits and just did a pull from the origin/master, and the local repo is correct on this other machine. 回答1: You can