openlp-core team mailing list archive

[mohij <patrick@xxxxxxxxx>]

> Sorry but if you propose a merge for a branch, get it approved then that is
> the one to merge not a different one.
> Why do we have 2 branches?

At first I proposed the original branch for merge. That one does contain a new image (the image for the wizard start page). That image took up the entire Preview Diff area below. As a result of the feedback (branch not being reviewable because of unusable diff), I created a branch of that branch, removed the image diff and kept it in sync with the original branch solely for review.
These two branches are completely identical. The only two differences are, that the image is missing in the review branch, and the review branch only has those "Merge upstream." commit messages.
-- 
https://code.launchpad.net/~patrick-zakweb/openlp/duplicate-removal-review-2/+merge/169614
Your team OpenLP Core is subscribed to branch lp:openlp.