On Wed, Aug 8, 2012 at 10:45 AM, Curtis Olson <curtol...@gmail.com> wrote:
> 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? :-)
>
brain surgery --abort :-)
Curt.
--
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
