Quote:
Originally Posted by DNSB
I was just noticing that your repository is still showing as:
This branch is 24 commits ahead of, 15 commits behind Sigil-Ebook/Sigil:master.
|
My personal repo was missing a few recent changes/fixes from BeckyEbook plus some older translations updates. So I cherry-picked them from official Sigil master to my personal repo.
When I added my changes to Sigil official master, I did not do a pull and merge. Instead I generated a diff by hand and edited it to include just the pieces I wanted.
Then I checked out Sigil-Ebook Sigil master and applied the changes using patch. Then pushed them in a few restructured commits from my local repo back to Sigil master (official).
So the source code is now up to date in Sigil-Ebook master. But the commits that got it there were "*different*" then the commits I used in my own repo but the end product should be identical.
But github can not tell that by looking at commit logs.
I have a tendency to hack around in my local repo and push to my personal github repo (so nothing gets lost) until I am reasonably happy. Then my personal repo will lie fallow until the next major change idea comes about.
Everything from here on out will happen from Sigil official master.