Chase <nicetry...@protonmail.ch> writes: > I guess I'm just having trouble understanding what I must do > differently, does my patch simply need to be rebased and the commits > deleting dtudcfonted can be reversed on your end, or do I need to > manually readd all the previous files by hand from a previous version > and repatch? Because one solutions seems a bit more like "madness" > than the other. As for it being almost but not quite finished, I > simply need to fix the remaining compiler warnings, problem is they > are kind of stumping me, so I'd like it committed so that I could have > some possible pointers on what I could do better and how to fix them. >
You need to do it yourself, yes. It doesn't need to be manual. I gave you a recommended solution to this situation below: >> > That sounds about right. I assume by revert, you mean that you used >> > `git revert` to cancel out the commits which removed the component to >> > begin with. So: >> > >> > - `git checkout -b dtudcfonted` >> > - `git revert <commit>...` >> > - Make some commits fixing up the software >> > - `git rebase master` >> > In plain English, if such is helpful, you need to: * Pull master (so you start up to date) * Start a new branch from master * Revert the commits which removed dtudcfonted using `git revert`. Read the man page -- this will create commits which add those files back in. You don't need to do it manually. * Apply your fixes. You can do this manually if you want; I would recommend `git cherrypick` or `git am` to just apply what you've already done. * pull master again, and rebase your new branch on top of it (just in case it has moved in the meantime) Now you can submit as patches all of the commits this process generated (or one squashed commit). -mrt ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ cdesktopenv-devel mailing list cdesktopenv-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
