Double merge of commits (force push used to correct)
pwaller opened this issue · 3 comments
I see we got two copies of the commits on main. Please use 'git pull --rebase' or configure your git client to do similarly when pulling.
I intend to force push to remove the duplicates (and cherry-pick fbf6590). Please send pull requests and use 'rebase and merge' where possible. You're welcome also to merge your own pull requests using good taste but please leave at least a day window or so to give people to an opportunity to comment before doing so.
* f042e00 (origin/master, origin/HEAD) Fix #103 - unicode whitespace logic
|\
| * fbf6590 Fix unicode whitespace issue
| * 5921ad2 Merge branch 'pwaller:master' into master
| |\
| |/
|/|
* | 6331a96 (HEAD -> tmp) Enable testing of pull requests
* | c315dea Fix a few more fonts and remove pointless test
* | 78afb9f Fix fonts with unicode separators and hierarchy smushing bug
| * c2f5353 (pb/master, peterbrittain/master) Enable testing of pull requests
| * 179f85b Fix a few more fonts and remove pointless test
| * 70a8ecc Fix fonts with unicode separators and hierarchy smushing bug
| * 710b3c2 Merge pull request #1 from pwaller/master
I've force pushed the new commit 36cb512, which removes the commits f042e00, fbf6590 and 5921ad2. Please let me know if you need help getting your git client back into a normal state.
Whoops! Too long since I've worked with github PRs... Sorry.
No problem, I'm really grateful for your help in general :). Feel free to email me as well if you need any help untangling things. Email in my github profile.