Your branch and 'origin/master' have diverged,Īnd have 1 and 1 different commit each, respectively. Please, fix them up in the work tree, and then use 'git add/rm 'Īs appropriate to mark resolution and make a commit. The command git remote prune origin -dry-run lists branches that can be deleted/pruned on your local. Pull is not possible because you have unmerged files. Master pushes to master (local out of date)įrom within dailyprogrammer and I get the message U Week10-Folder All ok so far.ģ) I cd into dailyprogrammer, and do a git remote show origin I'll describe everything step by step:ġ) I have cleaned my local 'dailyprogrammer', so now it doesn't have the 'Week10-Folder' in it.Ģ) The remote repo 'dailyprogrammer', though, has the folder 'Week10-Folder' in it with a readme that I had created when creating the folder. show origin', everything just tells me that the remote repo doesn't exist, when in fact I am just copying hte URL from github. Can someone help me out? I tried removing the damn thing by rm -rf, but that showed the same message again. I get the message fatal: repository '' not found However, when I type git remote show origin Then I want to sync this guy with the remote repo so I do git remote set-url origin Īnd no message appears. So I go to the dailyprogrammer folder in my laptop, then do a 'mkdir Week10-Folder'. Now I wanted to clone this guy into my local machine. So on github, my 'dailyprogrammer' repo now has a folder, 'Week10-Folder', with a readme.md in it. And even if we revert the commit, it would still be. I read on stackoverflow this was how one created a folder inside a gtihub repo. Pushing files that contain some secrets or sensitive information to a Git repository is fairly common. So I went to github/MyAccount/dailyprogrammer, clicked on 'New File', and then in the name, typed in the folder I wanted to create ('Week10-Folder'), then added a slash and a readme file name. I thought I should have a folder for each challenge (instead of have all files floating around in one big folder). My goal was to reorganize this a bit better. Gitkraken repo, failing to checkout branch, then suddenly deleting dozens of files. I had a git repo, called 'dailyprogrammer', and had lots of files in it (one for each /r/dailyprogrammer challenge I did).
0 Comments
Leave a Reply. |