-
Notifications
You must be signed in to change notification settings - Fork 110
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
add needed libraries to Lua examples as well (pgf-tikz#640 pgf-tikz#839) #882
Conversation
- changed order of mentioned libraries so they fit the order of references in the next sentence in `pgf/text-en/pgfmanual-en-tikz-shapes.tex`
…l as suggested in pull request pgf-tikz#872
Co-authored-by: Henri Menke <[email protected]>
Co-authored-by: Henri Menke <[email protected]>
# Conflicts: # doc/generic/pgf/text-en/pgfmanual-en-tikz-matrices.tex
# Conflicts: # doc/generic/pgf/text-en/pgfmanual-en-library-bbox.tex
…mple in `pgfmanual-en-tikz-graphs.tex` work closes issue pgf-tikz#755)
…mple in `pgfmanual-en-tikz-graphs.tex` work closes issue pgf-tikz#755)
As I have already written elsewhere I messed up something in my fork when I created the branch (before ilayn suggested another way I should work. So so far only the new commits should be
|
This looks like all your commits are coming from GitHub website (see the verified marks next to commits). So probably you then rebased and then pushed (I guess). This is rather tricky because if you don't "force push" (another wonderful terminology from git) you get all the previous commits of master as if you committed them in your fork. See all those "merged this that bla bla" commits? Those are precisely the ones which are your attempts to fix the problem as it gets worse and worse :) I would suggest the following: First type the following git branch -v This will list all your branches with the latest commits in them. Since you are struggling with many of them I would say save your work physically (copy and paste changed files to another independent folder somewhere) delete your branches except git branch -D <insert_branch_name> # NOTE: This will delete unconditionally so make sure you saved and start from scratch with my comments from the other issue by first syncing. I think we can afford to create a bit of clutter by closing this and #881 until you get the hang of it. When you are ready you can create a PR cleanly. |
(Hopefully I am not stating something wrong now.) Regarding the "Verified": I added the SHA key to TortoiseGit as well following a step-by-step guideline (maybe it was https://dev.to/c33s/sign-your-git-commits-with-tortoise-git-on-windows-3mlf). So locally I am asked at every commit for the GPG password. By this it is verified that I really am the cause of the mess ;) Regarding a fresh start for the
before reapplying the changes. |
Maybe one more thing: As can be seen the Travis CI failed in the https://travis-ci.com/github/pgf-tikz/pgf/jobs/351457958#L974-L979 I really don't think that I could have messed this up. Can you or @hmenke confirm this? Because for me it is very likely to appear again ... |
modified Lua (code)
examples
as well as @hmenke suggested.