LinuxQuestions.org
Go Job Hunting at the LQ Job Marketplace
Go Back   LinuxQuestions.org > Forums > Non-*NIX Forums > Programming
User Name
Password
Programming This forum is for all programming questions.
The question does not have to be directly related to Linux and any language is fair game.

Notices

Reply
 
Search this Thread
Old 04-29-2009, 01:04 PM   #1
knobby67
Member
 
Registered: Mar 2006
Posts: 536

Rep: Reputation: 42
Git error


Hi all,
I've been using git with my code for a couple of months now, but suddenly I've got and error. The only commands I use are

git commit -am "message"
then
git push unfuddle master
to push onto the net server

however suddenly I'm getting

! [rejected] master -> master (non-fast forward)

I've tried a pull from the master but this didn't fix it. I've check out the master and can see this

git checkout master
Ver2: needs merge
Source/HardwareConfig.c: needs merge
Source/HardwareConfig.h: needs merge
Source/Model_Control.c: needs merge

However I don't know how to fix this. Can anyone advise. Thanks.
 
  


Reply


Thread Tools Search this Thread
Search this Thread:

Advanced Search

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is Off
HTML code is Off


Similar Threads
Thread Thread Starter Forum Replies Last Post
error while downloading git vivek rai Linux - Newbie 8 01-12-2009 04:27 AM
inconsistency issue of git-clone ***/git/mesa/drm with the existing kernel source centguy Linux - Desktop 2 10-08-2008 10:36 PM
GIT error messages HelpMe2877 Linux - Server 3 07-11-2008 01:20 PM
Git Error with chdir permissions DiBosco Linux - Software 2 05-01-2008 01:36 PM
sled 10 git error Diws Suse/Novell 0 09-19-2007 01:56 PM


All times are GMT -5. The time now is 05:49 AM.

Main Menu
My LQ
Write for LQ
LinuxQuestions.org is looking for people interested in writing Editorials, Articles, Reviews, and more. If you'd like to contribute content, let us know.
Main Menu
Syndicate
RSS1  Latest Threads
RSS1  LQ News
Twitter: @linuxquestions
identi.ca: @linuxquestions
Facebook: linuxquestions Google+: linuxquestions
Open Source Consulting | Domain Registration