git gemfury push conflicts - ruby

I'm using gemfury and git with Ruby for the first time and am having trouble doing a push to my remote gemfury repository:
git push fury master
I get an error message saying that I need to do a git pull to update my code with the latest changes.
After doing a git pull I get several conflict errors but it doesn't make sense as it's a fresh clone of the master repo. Others from my team don't seem to get the same errors when building the same package.
I've tried deleting the local repository and doing a git clone again. I've also tried doing a git reset but without any progress.
Any help or pointers would be helpful as I haven't been able to solve this issue yet and it's starting to fustrate me. Thanks!

Related

Failing pulling existing Repo in Visual Studio

I downloaded a branch as zip file from git succesfully. After this I cloned repo from in the section below. But still I cant see all the branches that I wanna see. What's the problem here?
ss
try using,
git clone {repo-URL}
In this way the cloned directory will be a git repository with all the git history and branches...

ReadMe file won't allow me to commit and push xcode changes to github

I have an existing xcode project and repo on Github. I recently added a ReadMe file which was suggested by Github but now I can no longer commit and push changes to Github. I keep getting an out of date message. How do I fix this problem?
I had the same experience of adding README.md with the same error.
If you don't want to git pull, because the remote version in Github is outdated.
You can also force push all local branches using:
$ git push -f origin master
The following commands in the Terminal will push your local Xcode project to remote Github.
cd <drag location folder of project>
git init
git push -f origin master
You need to git pull.
If you're using the command line, navigate to the directory of the repository and run git pull. If you're using another interface, the steps may be a bit different.

git pull always returns "not something we can merge"

No matter what repository I am in I get this response from git pull "merge: 012012012012012012012012012012012012012012012012012012012012012012012012012012012012012012012012 - not something we can merge". I have tried uninstalling git and re-installing with no luck. git fetch origin and git merge origin/master work fine. I could very well use those commands instead of git pull but Homebrew uses git pull and now it is broken too.
[UPDATE] This apparently was related to pyenv. Once I removed that from my PATH then everything went back to normal.

git pull is not working on msysgit client?

I am using msysgit client, I am able to fetch,push but when I try to pull it shows
git: 'pull' is not a git command. See 'git --help'.
I tried for git --exec-path and it gives C:\git-client/libexec/git-core, this path exists but still I am not able to pull. Any idea?
As stated in comment above:
git pull is (usually) shorthand for doing a fetch then merge.
Check that git fetch works first.
Further later research shows that this may be a bug in a specific version of msysgit, https://code.google.com/p/msysgit/issues/detail?id=249 So try upgrading that also (always prudent advice).
Additionally, a few googles for "git: 'pull' is not a git command" turned up quite a few choices on various fixes, based on which platform you are working on, but most turned out to be a missing path to git-core, so also check those out.

Can I use gollum to create a wiki which isn't hosted by Github?

I want to create a wiki with gollum and push it to my own git repo, is that possible?
I created a new git repo, install gollum and started it. I got the "edit/Home" page. I added some content, saved...all looked good. Even the "revision history" showed that revisions occurred.
Then I stopped gollum and found there was nothing new in my git repo, I even checked if stuff hadn't been pushed...nothing. I'm not sure how/where it's storing the content that I add when I run it.
Any ideas?
Thanks
Gollum will not sync with a git remote. It will never perform git pull or git push. You must have gollum running on the remote server, or you must manually run git push on machines where you make edits, and git pull on machines who also want to see the wiki. This could be part of a cron job if you're running locally.
It is much easier to have the gollum process running on your web server. See below for more information:
http://www.nomachetejuggling.com/2012/05/15/personal-wiki-using-github-and-gollum-on-os-x/#toc-synchronization-with-github
May be you are checking a wrong repository, the default is for gollum to use or create a git repository at the root of page files. It can be changed with the options --page-file-dir and --base-path (cf gollum --help)

Resources