search

oe-alliance / branding-module

GNU General Public License v2.0
4 stars 34 forks source link

Further cleanup of ini5 rcpositions.xml and remote.html #5

Closed prl001 closed 10 years ago

prl001 commented 10 years ago

Reorder the buttons in rcpositions.xml to that they are in the same order as in remote.html, and the locations are grouped and ordered sensibly in rcpositions.xml.

Tweak the button locations in both files so that they are consistent and better reflect the button centres in ini5/rc.png.

atvcaptain commented 10 years ago

merge not possible update your request again

prl001 commented 10 years ago

Sorry about that. I was surprised when the pull request generated the message about conflicts.

I can't reproduce the conflicts on my clone. With a fresh clone to my Mac, I get this when I try to test the merge:

cambyses:branding-module prl$ git status
On branch master
Your branch is up-to-date with 'origin/master'.

nothing to commit, working directory clean
cambyses:branding-module prl$ git merge --no-commit origin/fix-bug-301-beyonwizt3-2
Updating 83724ca..9ad28f7
Fast-forward
 BoxBranding/remotes/ini5/rcpositions.xml | 104 +++++++++++++++++--------------
 BoxBranding/remotes/ini5/remote.html     |  48 +++++++-------
 2 files changed, 80 insertions(+), 72 deletions(-)
cambyses:branding-module prl$

Is there some way I can see the errors in the merge?

prl001 commented 10 years ago

Sorted.

I had made changes on an out-of-date clone of the repository.

Should be OK now.