> 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.
If the files no longer exist, I think one solution is to tell the system to skip the patch: git rebase --skip did the trick for me on a similar occasion. The rebase operation then goes on with the next patch. If you actually want the files, git checkout <branch where files still exist> -- <non-existing file> should fetch them from the branch where they still exist. I also frequently use git status to track what exactly the problem is. Although I am probably not the best source for GIT troubleshooting, I feel your pain. I've had similar trouble a few times. Cheers, * Thorsten ------------------------------------------------------------------------------ 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
