Hello, I installed Turtoise Git and has been unable to pull: From https://gitlab.com/website.com/restapi = [up to date] master -> origin/master Updating dad62f8..d807062 error: Your local changes to the following files would be overwritten by merge: application/controllers/User.php application/models/ContributionModel.php application/models/OrderModel.php Please commit your changes or stash them before you merge. Aborting git did not exit cleanly (exit code 1) (4391 ms @ 16/07/2018 10.08.12) I should create git stash first but do not undetstand how to? I already read https://git-scm.com/docs/git-stash Can anyone guide me how to create git stash?

Member Avatar
Member Avatar
+0 forum 1

When this news came across I only had to think of MSFT's prior acquisitions to think this may not end well. As the song goes " Should I Stay or Should I Go"?

Member Avatar
Member Avatar
+1 forum 7

Inbetween contracts over the last year or so I have been beavering away building a CMS with a difference. https://www.graphia.co.uk/ It's aimed at companies that have huge libraries of documents that every employee needs (operating procedures, handbooks, guides, etc) locked away in inflexible propriatory formats (aka Sharepoint/Confluence). * documents are stored in plain text (Markdown) files * the 'database' is a Git repository (but end-users needn't know!) * authors can work online using the web editor (but power users can clone the repo and work in whichever editor they like) * the documentation is 'published' to a static site, the …

Member Avatar
Member Avatar
+0 forum 5

Anyone knows how to work with Gitlab or Github? What's the difference. Also, how to install Gitlab so that you can collaborate coding with your coworkers for free. Is that possible? Thanks.

Member Avatar
Member Avatar
+0 forum 1

Hi guys, I'm a git first time user, and I followed this guide to set it up and get it up and running https://git-scm.com/documentation. So I'm now using git from the console (at the moment I'm logged in windows, so let it be the windows console). My question is - because I couldn't find this on the guide - say I'm logged in from another machine and I want to checkout my project, keep working on it and then commit the changes, is it possible? In other words, how do I access my existing repository from another machine?

Member Avatar
Member Avatar
+0 forum 3

How do I remove multiple files from a GIT repo that have already been deleted from disk?

Member Avatar
Member Avatar
+0 forum 1

I am just getting my feet wet with Git and am looking for tutorials for beginners. I am reading through the book, "Version Control with Git" by Jon Loeliger and Matthew McCullough, but am not finding it suitable for a Git virgin. It is written as if the reader is already familiar with Git and wants more in-depth information. Not much out there (in terms of paper and ink books.) I will be doing my own searches, but would still appreciate recommendations from Daniweb members. Any online books or tutorials you have found particularly suitable for a complete Git newbie?

Member Avatar
Member Avatar
+0 forum 10

I'm creating my first github repo in C# (compatability has only just been added), and I'm really unsure of how to structure my project. I know that many languages have folders like: /src /builds though i'm not sure how this would apply to C#. There's this C# project, although it looks quite messy, and I'm not sure whether this is appriopriate.

Member Avatar
Member Avatar
+0 forum 1

Hi All, I have a server that I'm using as a Git repository. I'm trying to clone from this repository to a GoDaddy server. I am getting the error "ssh: connect to host <my git server ip and port>: connection refused. I have checked the ssh_configs, sshd running, rsa keys, openssh-server/client, some stuff I forget, ... I haven't been able to fix the problem or google anything that has moved the issue along. I would talk to the kind folks at GoDaddy about this but the last two times I've called up I end up giving *them* technical support (and …

Member Avatar
Member Avatar
+0 forum 9

Hello all, First of all I wasn't really sure where to post this so please let me know if I'm in the wrong forum for such a question. I understand the basics of git, but I'm still very new. I have used git locally and on github. I was wondering if this was possible: I want to set up my main git repository in my Dropbox, then have the same repository on my local mac machine and a remote HPC. So when I can edit them in my dropbox and always have them pulling from there. The problem is I …

Member Avatar
Member Avatar
+0 forum 5

I've found that there are times when I need to pull down a repository, but when working with other people, there's always that certain file that holds particular user-specific customizations. We need to pull it down the first time, but every time afterward, I'd prefer it not get updated - pushed or pulled. Is there a way to do this? EDIT: Maybe I should use a hook script to download the file once? Forgive my GIT noobishness.

Member Avatar
Member Avatar
+0 forum 2

is git repository arec supported of visual studio 2010 ?

Member Avatar
+0 forum 0

I saw that github commands in linux terminal always uses word "git" before all it's commands. How to use my own word for my shell script? for example, $ git commit or $ git status

Member Avatar
Member Avatar
+0 forum 1

Hi Everyone! Just wondering: how many people here use [URL="http://github.com/"]GitHub[/URL]? I've been on it for maybe half a year now and I find it quite useful. What experience do you guys have with git? Cheers, xfbs

Member Avatar
Member Avatar
+0 forum 6

I have several different computers that I work on the same code. So on my server I have the master git repo. I have noticed that some code when I push then try to pull and or fetch on other computer it does not pull some of it down. Not sure if it is due to conflicts or not. Anyone have an idea why this is? Am I not using pull and or fetch properly? Thanks

Member Avatar
Member Avatar
+0 forum 1

I didn't realy know where to put this post, so please bear with me... I'm starting a new project with two friends of mine using github for code-hosting (and of cause git for version controll). Also I'm using lighthouse for bugtracking. Github has a nice and fully integrated post-receive hook for lighthouse that whenever I push to github it tells lighthouse about the update (gives it the revision-number and such). Now here beginns the trouble. For authentication the post-receive hook at github uses a token to "tell" lighthouse "who it is" that is updating, which means that whenever I push …

Member Avatar
+0 forum 0

I seem to remember a friends and fiends feature (or was this on another site?). While the friends/contacts feature still exists. It would be nice to have a "git-list". There's quite a few people I've helped over the last few years who never bothered to reply/mark the thread solved etc. I can't keep track of them all, so a git-list would be useful. If I saw a post requesting help and found that that particular git was on my list, I could happily ignore said git. Not that I'm a praise-junkie or anything, but these guys end up wasting a …

Member Avatar
Member Avatar
+0 forum 3

The End.