I changed my Github password and now I'm unable to push/pull from any of my local repos to/from Github. Gitbox (http://www.gitboxapp.com/) prompts me for a username/password which I input (have double and triple checked!) but then fails with the…
I just upgraded to Xcode 5 and now Gitbox doesn't seem to be able to find FileMerge as the diff tool, and has no options for setting a path manually. Anyone know a way to link it up again?
I like using Git software to push commits, but the ones I use (Gitbox, Github, SourceTree) all ask for a local repo when adding a new repo to them.
Thing is, my repo is on my development server not my local machine.
So can Git software use a…
FYI I am running MAMP on OSX. The remote repo is fine. I have cleared out the .git folder and .gitignore file from my local directory however as I was having problems with it. Here is the problem I currently face:
If I do git init in my local…
I'm trying to make a key binding to open up my favorite git application with current Sublime Text 3 $project_path folder, but somehow Sublime Text 3 doesn't convert the variables into the actual path.
Below you can find my current keyboard bindings…
A few years ago, someone asked how they could get the bottom pane in FileMerge back. The answer was that FileMerge remembered your settings, and if you'd accidentally resized the bottom pane to take up no space at all, it would faithfully be…
I'm sure something is wrong with my git directory.
I set up my submodule using
git submodule add ssh://someUrl/confusionutil.git confusionUtil
and this all works well. Seems like the submodule is acting right and has a .git file that says:
gitdir:…
I'm new in the forum and also new in git, github and all the other git-things. Another person and I are using for our degree project git and github, but as I'm not a good friend of the terminal it's really driving me crazy.
Let me tell you what…
I added a Git repo as a submodule to my existing project which is also Git managed, I did these in command line, and I use GitBox to manage my projects, then when I open GitBox, it just crashed, I tried many times and even restarted the…
I am not sure if anyone has experienced this, but ever since I downloaded Gitbox from the Mac App Store and I click on "Clone in Mac" from github.com. It launches Gitbox instead of GitHub for Mac. Sure enough when I uninstall Gitbox, clicking on…
I'm still learning the dark arts of programming. I'm OK on the programming side, but now I'm struggling to push it to GitHub before I pull it into Engine Yard.
I've made changes, Git sees the changes, but when I commit, I get the following…
I use Gitbox as my version control tool on MAC OSX. When using the app, I see an odd image next to the author name. For example, this is the image I am referring to:
( This image is just an example. I am not showing the actual photo I see. The…
A coworker of mine is using Gitbox to do all of his committing, pushing, etc., with Git. Right now when he pulls, his last commit message is destroyed and replaced with a merge commit message. It would be great if he could use the --rebase flag when…
Here is what has happened
In master local branch .. I did a merge with mtv branch
git merge mtv
There were conflicts, I merged those and see the modification in my gitbox.
I did not commit but somehow, I have no idea what button was pushed, it…
I am new to managing code revisions and need guidance on how to merge to code sets. I have a MASTER branch with my latest UI and I have a branch called "Feature-A" with lots of Django additions + template additions to the previous UI files.
Since…