On Mar 26 12:30, Corinna Vinschen wrote:
On Mar 26 11:53, Thomas Wolff wrote:
Am 26.03.2018 um 10:01 schrieb Corinna Vinschen:
On Mar 25 11:02, Thomas Wolff wrote:
as attached
Thomas
Thanks, but the patch is broken. The last line in the patch is the
start of another patch hunk, which then is missing. Can you fix that, please?
Yeah, I tried to limit git fiddling effort by manually manipulating the
patch, which failed.
Never a good idea.
(After I tried to re-sync with the current repository, it would insist on
some merging, and I do not know how to rectify that;
Never do your patches on the master branch. Create a new branch from
current master and work there:
git checkout -b fix-towctrans-doc
[hack, hack, hack]
git commit
git format-patch
After the changes have been commited, just remove your hack branch, e.g.:
git checkout master
git fetch && git merge (or `git pull)
git branch -D fix-towctrans-doc
Since branches are local, they are really cheap, very different from
CVS, for instance.
Oh, and you can keep your hack branch in sync with master, like this:
git checkout master
git fetch && git merge
git co fix-towctrans-doc
git rebase master
[...]
then cherry-pick your patch on top of master and, if required, fix
conflicts:
git co master
Yikes, local alias here. That should have been:
git checkout master
git cherry-pick 123abc456def
Corinna