I used Github Desktop to perform a complex merge and now I've noticed that my terminal is not picking up any changes when I run:
git status
I need to first push the code up to origin using Github Desktop, then pull down in my terminal in order for the changes to take place.
Has anyone seen this before?
It appears that github desktop somehow made a clone of the repo in a new location which is why my terminal wasn't locating the file changes. The github desktop repo was located at: /Users/NAME/Documents/GitHub/repo-name. I'm sure this is something I screwed up during setup but figured I'd throw this out there in case it helps anyone!
Related
I have setup a local Jekyll site that is configured to deploy to Github pages. I used the "Chirpy" theme (see https://github.com/cotes2020/jekyll-theme-chirpy) and followed the instructions successfully to get it to deploy the first time.
I am trying to get my 2nd commit w/ updates to deploy but the process is failing when the Github action runs. I see this output:
This is my first attempt at any of this so don't have any perspective on what is going on w/ any of these technologies.
Thanks for any help and LMK what else might make things clearer!
It seems like after you run test.sh, you tried to switch branches. I suspect that is the problem because it doesn't appear that you tried to git reset or anything like that. I believe your test.sh ran (see these lines) so there are unstaged changes.
If you don't want those changes, you might try a git stash to easily reset. Just a thought.
So the issue was that I checked in the _site and .jekyll-cache directories. Here is the proper .gitignore entries to have the standard gh-pages branch build w/o this problem.
https://github.com/github/gitignore/blob/master/Jekyll.gitignore
I used to fork a repo on GitHub and then clone my fork, and be in origin.
Recently I've been cloning the original repo and then using hub fork, and now my remote has my username instead of origin. (I understand why this is happening, that's not my question).
I can use git push my_username master in the command line. But I'd rather use the sync button/commands in VS Code. But that's trying to sync with the origin, which of course I don't have permission to push to.
How do I switch it to push to my fork? I actually got it to work once, but it was by a bunch of accidental clicking.
I believe you are looking for the repository settings. The link to them is located under the Team Explore Tab -> Settings -> Repository Settings. At the bottom of that area under remotes you can specify the remote origin for push and fetch.
UPDATE: The above is for VS 2015 GIT settings. This is different for VS Code. In the Source control area there is three dots (...), click on these to get to the more options including the remote origin. I don't have VS Code so I can't help you after that point. Hopefully the documentation will guide you further if you need help.
https://code.visualstudio.com/docs/editor/versioncontrol
I recently created a website using blogdown and now hosting it on a GitHub repository and netlify to deploy. When I set it up, I followed the directions to clone my GitHub repository to be able to commit files using the git version control. So making changes within Rmarkdown and then committing them to my GitHub repository was easy.
However, when I connect to the project now, the window where I can commit changes does not appear. That is, I no longer have the option to commit changes within R studio. My guess is that the connection between the terminal and GitHub was changed/removed? Does anyone know how to re-establish this? I've looked up the syntax to use in the terminal, but I couldn't find a similar problem - that is, re-establish the connection between my GitHub with an already existing project already on my desktop.
Posting an answer to this question in the case others have a problem. It was an issue with MojaveOS. You have to re-install command line tools in the terminal.
xcode-select --install
Doing this, the version control now works to commit files to my github repository.
I am trying to use a team services account to store other related documents for a project such as some spreadsheets. I want the client to have access to it, but they are not programmers so I am not wanting them to use VS.
The client can access it directly without a problem and can download files, the biggest issue is they will need to be able to upload files as well. Without using a client of some sort they are limited to 10mb or less which won't work for them.
I cannot seem to get github for the desktop to access my online repository unless I first go into VS and clone it.
I am trying to avoid having to walk the client through doing that and would like to be able to use a GUI like github desktop from end to end.
We are all in a Windows environment.
I can create a new repository in github desktop, but cannot seem to figure out how to connect it to my remote (I can't find the URL for the remote anywhere).
I feel I am so close but just missing a couple items, any push would be appreciated.
GitHub Desktop is for GitHub. GitHub is a Git repository hosting service. Not surprisingly, the GitHub tool only works with GitHub.
You can use any general-purpose Git client to interact with VSTS Git repos. SourceTree is good.
You can use some git GUI or git command line to operate local repo.
Git GUI: as Daniel Mann said, you can use soucetree, or tortoiseGit etc.
Git command line:
you can download git here ->
git clone https://account.visualstudio.com/_git/projectname ->
enter email and password to clone ->
git add . (when you add some files) ->
git commit -am 'message'(commit the changes you make) ->
git push(push your commits into VSTS git repo) ->
git pull(pull VSTS git repo changes to localt).
I am just closing this out, thank you to both folks who did answer. I understand that I am using GIT and that GitHub Desktop is for Github. I was looking for the best way to work with a Github repository without using VS and how to access the team services repo for a client of mine. I set him up with Gitkraken which is working. I was never able to figure out how to get Github Desktop to properly clone and push items, but I did not spend a ton of time in it once I used Gitkraken.
Thanks again for taking a swing at it.
I accepted the answer I did because suggesting using the command line at least shows a understanding of my question and what I was looking for.
I know I am late to the game but I can confirm that tortoise git and getext also work fine with VSTS
So I have my local computer - where I've updated my (html/js/css) code, github (where I've pushed the updated code already by doing a git add + git commit + git push origin master) and then the server of the actual website which the code is for.
I've connected to the server via the command line terminal. I've already previously cloned the code to the server (by running the command git clone [REPO URL]) while logged in to the server via SSH, so the (un-updated-)files are there.
But now that I've updated the code, and pushed that update to github, how do I now update or push the repo/code/updated-github-code to the server???
I'm currently looking at the terminal with
[~]#
^ showing. I tried to git clone [REPO URL] again, but then I get the msg:
fatal: destination path 'name of my file' already exists and is not an empty directory
Am I missing or overlooking a step? Well obviously I am but I could use some help please. Like I said I'm trying to update the code to the server so the actual website will reflect the changes I made to the code and so everything is in sync (local code, code pushed to github and hopefully/eventually the code on the server/website).
I am just learning this obviously, so go easy on me (I've spent almost the entire day learning to connect to the server via SSH in terminal)...
Also, feel free to correct my terminology...
Pull from github while ssh'd into the server using the link from the github repo "copy to clipboard" button on the web interface. If that doesn't work you could try wiping the repos folder on the server and cloning from scratch. But use that option with caution if downtime is unacceptable for this particular web app.