A quick update here. Rob pointed out the "git rebase --abort" command
which got me back to a sensible working state. I was able to reevaluate my
original problem which turned out to be a simple merge conflict in my
branch vs. changes in "master" and I was able to fix that and successfully
merge -- so I'm in a reasonable working state again.
But I would mind rebasing my local changes, but I still get an error.
I think what happened originally is I changed the directory name of my
aircraft from Malolo1 to Resolution, then thought for a second and changed
it again to ATI-Resolution -- and then did that all as a single commit.
Now the rebase throws fits on that patch.
It complains about whitespace errors, then falls back to a 3-way merge,
then reports conflicts with all the files in the 2 old directories, for
example:
Aircraft/Malolo1/Engines/18x8.xml: needs merge
Aircraft/Resolution/Engines/18x8.xml: needs merge
The typical fix is to edit the conflicting files and "git add" them the run
"git rebase --continue". But these files don't exist so I can't edit them,
git add fails, git rm also fails since they don't exist.
I suppose I could abandon this branch, figure out the diffs against
"master" manually, create a new branch, and copy those diffs into my new
branch -- but then I would lose all my history and that just doesn't seem
very git-ish -- I hate to go against the spirit of "git" which is more
along the lines of performing brain surgery on myself when I don't quite
feel happy -- what could go wrong? Or what do I do when something goes
wrong? :-)
Curt.
On Wed, Aug 8, 2012 at 9:27 AM, Curtis Olson <curtol...@gmail.com> wrote:
> I've run into a problem with git and I seem to hit a dead end no matter
> which way I turn. I'm hoping this is something easy to solve, but the
> details might be complicated to communicate? I'll try to start simple --
> I'm working with the fgdata repository. I created my own branch and have
> been tracking some experimental stuff there. This has been working well
> and when I do a "git pull" I will checkout my local branch and merge with
> the master to make sure everything is tracking well and stays compatible.
>
> With my most recent attempt to merge my local branch with master I got an
> error (unfortunately now I do not remember what the exact error was, and I
> had to do a reboot for other reasons in the mean time.) My first thought
> after getting an error trying to merge was maybe I should rebase since I've
> just been merging all along.
>
> So I ran "git rebase" and that ran did a lot of work, but then generated
> some error messages about whitespace, and then displayed some message that
> it had to fall back to a 3-way diff. That ran and ran for quite some time
> and (I think?) errored out. Again, I don't have the message any more. :-(
>
> Now after my reboot, I'm trying to figure out what's going on. If I run
> "git branch" I get:
>
> $ git branch
> * (no branch)
>
> If I try to checkout any branch I get a list of files that need merge and
> then the message: "error: you need to resolve your current index first".
>
> If I "git add" any of these files, what branch am I adding them to and
> merging them into? (no branch)?
>
> It seems like all the git help I can find for these error messages
> presumes I can checkout a branch -- but I can't. Any suggestions?
>
> Thanks,
>
> Curt.
> --
> Curtis Olson:
> http://www.atiak.com - http://aem.umn.edu/~uav/
> http://www.flightgear.org - http://gallinazo.flightgear.org
>
>
--
Curtis Olson:
http://www.atiak.com - http://aem.umn.edu/~uav/
http://www.flightgear.org - http://gallinazo.flightgear.org
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
