[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
Re: [tor-bugs] #32097 [Applications/Tor Browser]: Fix conflicts in mobile onbarding while rebasing to esr68.2.0
#32097: Fix conflicts in mobile onbarding while rebasing to esr68.2.0
-------------------------------------------------+-------------------------
Reporter: gk | Owner: tbb-
| team
Type: defect | Status:
| needs_review
Priority: Very High | Milestone:
Component: Applications/Tor Browser | Version:
Severity: Major | Resolution:
Keywords: TorBrowserTeam201910R, tbb-9.0-must | Actual Points:
Parent ID: | Points: 0.5
Reviewer: | Sponsor:
-------------------------------------------------+-------------------------
Changes (by sysrqb):
* status: new => needs_review
* keywords: TorBrowserTeam201910, tbb-9.0-must => TorBrowserTeam201910R,
tbb-9.0-must
Comment:
I used `22182890f20069201b37a0e8d9a849d2e54fcc25` as the new base. I
reverted (in order): `484ec9407da4234000a73d2426f09de62de0274e`
`ab8797462cefdaf99d10e1981f2a168750cc697a`
`303c1ef548d23dfd0d8aa1e9e61481c1baea02a8`
`896fa0df588de10b22e827b8f9999c69daa9e05d`
`1c54037a5bb7ded841b5a795041772a4571944f9`
`a7cc5967877636728e29ea865dc46a2889b7de58`
`a3f466a3ac73f0d11f3f3ba054173087e66a0ab5` and then rebased `origin/tor-
browser-68.1.0esr-9.0-3` onto the result.
I fear we may have more problems with this in the future if/when Mozilla
modify the onboarding panels again. I felt resolving the merge conflict
wasn't easy to review, but we can reconsider this if needed.
I pushed branch `bug32097_02` based on 68.2.0esr.
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/32097#comment:4>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
_______________________________________________
tor-bugs mailing list
tor-bugs@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs