XML Parse error on Local Build
David T.
sunfish62 at yahoo.com
Thu Dec 8 00:32:15 EST 2016
> On Dec 8, 2016, at 1:00 AM, Geert Janssens <geert.gnucash at kobaltwit.be> wrote:
>
> Hi David,
>
> To fix the reports chapter omission, just create a new commit on your current
> PR. It's not strictly related but it's a rather trivial change so I don't see
> the need for you to go through all the hoops of creating a separate branch and
> pull request. Have your commit message for this additional commit clearly
> state it's fixing an omission to your previous work. You can mention the other
> bug number in there. Then everybody can follow what is going on.
>
> In general, once a commit is integrated in the main repositories, you
> shouldn't change them anymore. So your question of 'somehow adding it to my
> previous commit' is a no-go, because that commit is already in the main
> gnucash-docs repository.
>
> While it's not needed at all in this case, the formal way would have been to
> create a new branch from maint and make the change on that branch. If you
> change the same file on two branches, this may indeed result in a merge
> conflict later on, but only if the changes are near to each other in the file.
> "Near" usually means less than 4 lines apart. If they're further away, git
> still knows how to perform the merge. As the changes in this case are easy to
> understand for the more experienced developers, we would have been able to
> resolve this conflict if the changes were too close together. In general this
> becomes more difficult with the number of conflicts in one merge.
>
> Regards,
>
> Geert
Geert,
I’ve done as you advised, and it looks like it’s in the PR (commit 695bd264903428845b7b6ec2b200b0e1b3943d32).
Cheers,
David
More information about the gnucash-devel
mailing list