Sorry To Be A Royal Pain...

David T. sunfish62 at yahoo.com
Sun Sep 11 04:05:04 EDT 2016


but, my documentation itch needs scratching, and I want to make sure my efforts at helping actually help.

I’ve been generating traffic with ideas on how to improve the documentation, and it seems to me I should dig back into the catacombs of Git to implement some of my great suggestions. Please bear with me, as I have numerous areas in git where I could use help.

Before I start digging in to new bug fixes in the documentation, I want to be sure I am working on a current copy of the documentation. For background, I am working on a Mac, using SourceTree to navigate git. I have my own github account at github.com <http://github.com/> and I have forked master from https://github.com/Gnucash/gnucash-docs <https://github.com/Gnucash/gnucash-docs>. 

On github, when I open my fork it says at the top:

This branch is 27 commits behind Gnucash:master.

I realize that I should do something to not be behind—but what precisely am I supposed to do? Do I take action on github, or in Sourcetree? Which action?

Next, my SourceTree maint repository points to github.com/sunfish62/gnucash-docs <http://github.com/sunfish62/gnucash-docs>, and I have 3 branches on my machine for three bugs I worked on in February (743672, 762656, and 762088). The last two of these bugs now read on BugZilla RESOLVED FIXED, while the first is still on BugZilla as NEW. My Sourcetree screen looks like this:



I am not sure what this signifies, whether I need to do something (or whether whatever I do above will affect this). I note that the highlighted line includes both 743672 and 762656; does this mean that I somehow added my branch for 743672 to my branch for 762656? If that is what I did, I imagine it would be preferable for 743672 to have its own branch; is there a way to untangle them?

Finally, on github, the pull request for 762656 originated with me, and John and I exchanged some comments about technical aspects of the commit, and the page concludes with the note: 
> Closed with unmerged commits
> This pull request is closed, but the sunfish62:bug-762656 branch has unmerged commits.
> 

Clearly, I did Something; probably, I should clear this up. Can I simply click the Delete Branch button—or will that cause the whole patch to go away?

Humbly,
David T.


More information about the gnucash-devel mailing list