Chase via cdesktopenv-devel <cdesktopenv-devel@lists.sourceforge.net> writes:
> To be honest, I don't know how I would go about doing this, help would > be appreciated. Is it at least pheasable to revert the previous > commits and apply this one? I put a lot of work into it. My git > workflow consists of master and then a custom branch where I reverted > the previous commits and patched the software. 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` You'll need to rebase your branch on master at the end to make sure your patch is applied to the latest code. I believe Jon wants this fully fixed up before he will merge it. Him and I discussed these requirements in a previous thread on this list. As this may take some time, you may want to periodically rebase to keep the branch in sync, rather than doing one big rebase at the end. When you finally do submit, you need to submit *all* of the patches on your branch - including the initial reverting commits. This could take the form of several patches in one E-Mail, or one big squashed patch. Does this clear things up for you? -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
