897213 - Resolve v1.1.0hd merge conflicts found July 23, 2013

Status: VERIFIED FIXED

(Firefox OS Graveyard :: Gaia, defect)

Description

[John Ford [:jhford] CET/CEST Berlin Time]

+++ This bug was initially created as a clone of Bug #891179 +++

I just tried to merge v1-train into v1.1.0hd.  There are a few merge conflicts and I am not the right person to resolve them.  Wayne or Evelyn, could one of you please resolve the merge.  When you've done so, we need to comment and set flags on all the bugs that are merged over to v1.1.0hd.  You can do that manually, or if you comment on this bug with the commit range of the merge, I can do that automatically (this is the v1.1.0hd abc123de..123f456ab line when you push).

# Unmerged paths:
#   (use "git add <file>..." to mark resolution)
#
#	both modified:      apps/camera/style/camera.css
#	both modified:      shared/style/switches.css

Comment 1

[Tim Guan-tin Chien [:timdream] (please needinfo)]

Resolved with 4395308df4cc37062cdf475f14858856ddce2d08

Comment 2

[John Ford [:jhford] CET/CEST Berlin Time]

(In reply to Tim Guan-tin Chien [:timdream] (MoCo-TPE) from comment #1)
> Resolved with 4395308df4cc37062cdf475f14858856ddce2d08

Tim, could you please paste the commit range for this merge so that I can comment on the bugs and set flags?

Comment 3

[Tim Guan-tin Chien [:timdream] (please needinfo)]

Should be a64f37c3327e4cf2105a16eedaf68727bb2adbde...624a607b1d4ad1bbefa0b7efb4e7b0151052421f

I don't know if it's possible to visualize this range in Github :-/

Comment 4

[Tim Guan-tin Chien [:timdream] (please needinfo)]

Should be

https://github.com/mozilla-b2g/gaia/compare/624a607b1d4ad1b...a64f37c3327e4cf2

Comment 5

[John Ford [:jhford] CET/CEST Berlin Time]

if you copy and paste the line that git push spits out when you do the push (or push -n), I can use it as is in my commenting program :)

All bugs commented on, flags set.

Comment 6

[Tim Guan-tin Chien [:timdream] (please needinfo)]

(In reply to John Ford [:jhford] -- please use 'needinfo?' instead of a CC from comment #5)
> if you copy and paste the line that git push spits out when you do the push
> (or push -n), I can use it as is in my commenting program :)
> 
> All bugs commented on, flags set.

Woot, thanks, should we close this bug?

Comment 7

[John Ford [:jhford] CET/CEST Berlin Time]

oops, yes!