git-tower | 易学教程

Trouble setting up Tower with my GitHub Account - error: could not lock config file

阅读更多关于 Trouble setting up Tower with my GitHub Account - error: could not lock config file

问题 I've been using the GitHub for Mac app but on the suggestion of a friend, decided to give Tower a shot since it can also handle Beanstalk accounts as well. After installing the trial and putting in my GitHub username and password, I'm given this error: error: could not lock config file /Users/joshferrara/.gitconfig: Permission denied I was just curious if anyone knows what's causing this or if it has any relevance to me using Tower. Any help is greatly appreciated! Permissions on the file:

Trouble setting up Tower with my GitHub Account - error: could not lock config file

阅读更多关于 Trouble setting up Tower with my GitHub Account - error: could not lock config file

Git: Files pushed from local repo not showing up in remote git repo

阅读更多关于 Git: Files pushed from local repo not showing up in remote git repo

问题 I'm brand new to git and am just starting to figure things out. I have been trying to figure out git on my remote dev server as well as my local machine. I have installed git successfully on both my remote server and my local machine (OSX). I am using a mac git client called Tower, here is my dilemma... I can successfully create a bare repository on my remote server, no problems there. I then open up Tower and attempt to clone my remote repository to my local machine. I've been able to do

Git forking and pull-request workflow

阅读更多关于 Git forking and pull-request workflow

问题 I have a repo of a react project. I'd like to take that repo as the "base" of a few other projects and use it as a starting point. I'd also like to keep all of the other repos which stem from it up-to-date based on what the "base" has going on. I am using Bitbucket for remote repo hosting and Tower locally as a nice GUI. Is the correct way to do this is fork the "base" in Bitbucket, and then clone it locally? Will the local repo be aware of updates to the "base" repo in any way? How would I

SSH asking every single time for passphrase

阅读更多关于 SSH asking every single time for passphrase

问题 I have an annoying problem with my private key. Every time I want to clone or push via ssh in terminal or Tower app, I have to type my passphrase. I even removed and recreated the ssh key and set the key on Github several times, but it looks like it has a short lifetime and after a couple of minutes, is expired! I followed generate a new SSH key to create the key. At the end I ran ssh-add ~/.ssh/id_rsa and it printed out: Identity added: /Users/sajad/.ssh/id_rsa (/Users/sajad/.ssh/id_rsa)

In git merge conflicts, how do I keep the version that is being merged in?

阅读更多关于 In git merge conflicts, how do I keep the version that is being merged in?

问题 I have two local git branches on my machine - a branch called "v2" and a branch called "master". I'm merging v2 into master while master is checked out and the head branch. I'd like to merge the "v2" branch into the "master" branch. When I perform the merge, there are a number of conflicts that I must resolve one by one. For each conflict, how do I keep the "v2" branch file and not the "master" branch version of the file? The options presented to me by Git Tower for these types of conflicts

Push to remote server while excluding some committed files?

阅读更多关于 Push to remote server while excluding some committed files?

I recently integrated Git into my workflow, and I'm impressed with its capabilities. Not only is it a great VCS, it's running laps around FTP when pushing via ssh. I did run into a hitch this evening though, and I'm wondering if you fine folk can help me resolve it. There are certain files in a project that I want to track, but don't want to push to production. Is there a way to push to a production server while excluding certain files from the repo? Two great examples: .less files don't need to be on a production server at all, but ABSOLUTELY should still be tracked As my local and production

git excludes vs ignores

阅读更多关于 git excludes vs ignores

问题 I use Tower for using Git in Mac. The settings in Tower has Ignores section which creates the .gitignore, but it has another section named "Excludes". And it seems like that one can use excludes with "# git ls-files --others --exclude-from=.git/info/exclude". What Excludes is for? Why one needs excludes when gitignore is available? 回答1: It's a list of files that are not in .gitignore (which can be versioned), but which you want to exclude on your machine's copy of the repo. From the docs:

git excludes vs ignores

阅读更多关于 git excludes vs ignores

I use Tower for using Git in Mac. The settings in Tower has Ignores section which creates the .gitignore, but it has another section named "Excludes". And it seems like that one can use excludes with "# git ls-files --others --exclude-from=.git/info/exclude". What Excludes is for? Why one needs excludes when gitignore is available? It's a list of files that are not in .gitignore (which can be versioned), but which you want to exclude on your machine's copy of the repo. From the docs : Patterns which are specific to a particular repository but which do not need to be shared with other related

In git merge conflicts, how do I keep the version that is being merged in?

阅读更多关于 In git merge conflicts, how do I keep the version that is being merged in?

I have two local git branches on my machine - a branch called "v2" and a branch called "master". I'm merging v2 into master while master is checked out and the head branch. I'd like to merge the "v2" branch into the "master" branch. When I perform the merge, there are a number of conflicts that I must resolve one by one. For each conflict, how do I keep the "v2" branch file and not the "master" branch version of the file? The options presented to me by Git Tower for these types of conflicts are: Mark FILENAME as Manually Resolved Resolve by Keeping FILENAME Resolve by Deleting FILENAME Restore