<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>241731</bug_id>
          
          <creation_ts>2022-06-17 16:13:13 -0700</creation_ts>
          <short_desc>`git webkit pr` says I have unstaged changes</short_desc>
          <delta_ts>2022-06-24 16:14:12 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Tools / Tests</component>
          <version>Safari Technology Preview</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>NEW</bug_status>
          <resolution></resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          <blocked>239082</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Simon Fraser (smfr)">simon.fraser</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>jbedard</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1876549</commentid>
    <comment_count>0</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2022-06-17 16:13:13 -0700</bug_when>
    <thetext>OpenSource % git webkit pr --issue 241730
Switched to a new branch &apos;eng/IntersectionObserver-stops-tracking-when-cmd-is-used-to-zoom-in&apos;
Created the local development branch &apos;eng/IntersectionObserver-stops-tracking-when-cmd-is-used-to-zoom-in&apos;
Branch &apos;main&apos; set up to track remote branch &apos;main&apos; from &apos;origin&apos;.
  Running status to find changed, added, or removed files.
  Reviewing diff to determine which lines changed.
  Extracting affected function names from source files.
  Change author: Simon Fraser &lt;simon.fraser@apple.com&gt;.
[eng/IntersectionObserver-stops-tracking-when-cmd-is-used-to-zoom-in 70096fa91fbc] IntersectionObserver stops tracking when cmd+ is used to zoom in https://bugs.webkit.org/show_bug.cgi?id=241730
 Date: Fri Jun 17 16:06:07 2022 -0700
 3 files changed, 50 insertions(+), 8 deletions(-)
 create mode 100644 LayoutTests/intersection-observer/root-margin-percentage-units-with-zoom-expected.txt
 create mode 100644 LayoutTests/intersection-observer/root-margin-percentage-units-with-zoom.html
remote: Enumerating objects: 217, done.
remote: Counting objects: 100% (212/212), done.
remote: Compressing objects: 100% (126/126), done.
remote: Total 217 (delta 97), reused 190 (delta 85), pack-reused 5
Receiving objects: 100% (217/217), 773.59 KiB | 3.31 MiB/s, done.
Resolving deltas: 100% (99/99), completed with 38 local objects.
From https://github.com/WebKit/WebKit
   ae412c0c44ff..43ae82f9ba1a  main       -&gt; main
   ae412c0c44ff..43ae82f9ba1a  main       -&gt; origin/main
From https://github.com/WebKit/WebKit
 * branch                      main       -&gt; FETCH_HEAD
Successfully rebased and updated refs/heads/eng/IntersectionObserver-stops-tracking-when-cmd-is-used-to-zoom-in.
Cannot rewrite branches: You have unstaged changes.
Failed to rebase &apos;eng/IntersectionObserver-stops-tracking-when-cmd-is-used-to-zoom-in&apos; on &apos;main,&apos; please resolve conflicts</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1876550</commentid>
    <comment_count>1</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2022-06-17 16:16:43 -0700</bug_when>
    <thetext>I ended up with a good commit on the branch:

OpenSource % git log
commit 4384c4af75c56f4947ae20553c7a61389a01f499 (HEAD -&gt; eng/IntersectionObserver-stops-tracking-when-cmd-is-used-to-zoom-in)
Author: Simon Fraser &lt;simon.fraser@apple.com&gt;
Date:   Fri Jun 17 16:06:07 2022 -0700
...

and I&apos;m up-to-date with main:
OpenSource % git rebase main
Current branch eng/IntersectionObserver-stops-tracking-when-cmd-is-used-to-zoom-in is up to date.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1878287</commentid>
    <comment_count>2</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2022-06-24 16:14:12 -0700</bug_when>
    <thetext>&lt;rdar://problem/95886935&gt;</thetext>
  </long_desc>
      
      

    </bug>

</bugzilla>