Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

av stack sync --rebase-to-trunk --all doesn't pull down latest master #456

Open
hakanalpaydd opened this issue Nov 14, 2024 · 1 comment

Comments

@hakanalpaydd
Copy link

~/Projects/web-next/services/consumer-web-next master ⇣
» av st switch 
                                                                         
  ✓ Checked out branch                                                   
                                                                         
    * NVG-1070_chase_web_next_add_is_card_payment_to_query               
    │ https://github.com/doordash/web-next/pull/28303                    
    │                                                                    
    │ * NVG-1076_chase_checkout_fix_country_code_bug                     
    │ │ https://github.com/doordash/web-next/pull/29805                  
    │ │                                                                  
    │ │ * NVG-1077_chase_m1_analytics                                    
    │ │ │ https://github.com/doordash/web-next/pull/29973                
    ├─┴─┘                                                                
    * master (HEAD)                                                      
                                                                         
  Checked out branch NVG-1070_chase_web_next_add_is_card_payment_to_query
                                                                         

~/Projects/web-next/services/consumer-web-next NVG-1070_chase_web_next_add_is_card_payment_to_query ⇣⇡
» av stack sync --rebase-to-trunk --all
                                                                                                                            
  ✓ GitHub fetch is done                                                                                                    
  ✓ Restack is done                                                                                                         
                                                                                                                            
    * ✓ NVG-1070_chase_web_next_add_is_card_payment_to_query 7b1afac                                                        
    │                                                                                                                       
    │ * ✓ NVG-1076_chase_checkout_fix_country_code_bug e5e2b55                                                              
    │ │                                                                                                                     
    │ │ * ✓ NVG-1077_chase_m1_analytics 305cfbb                                                                             
    ├─┴─┘                                                                                                                   
    * master ff6ed06                                                                                                        
                                                                                                                            
  ✓ Not pushing to GitHub                                                                                                   
                                                                                                                            
    Following branches need to be pushed.                                                                                   
                                                                                                                            
      NVG-1077_chase_m1_analytics                                                                                           
        Remote: 305cfbb [NVG-1077] chase m1 analytics 2024-11-14 10:50:22 -0500 -0500 (4 minutes ago)                       
        Local:  305cfbb [NVG-1077] chase m1 analytics 2024-11-14 10:50:22 -0500 -0500 (4 minutes ago)                       
        PR:     https://github.com/doordash/web-next/pull/29973                                                             
                                                                                                                            
      NVG-1070_chase_web_next_add_is_card_payment_to_query                                                                  
        Remote: 78de6b8 NVG-1070 chase web next add is card payment to query 2024-11-14 10:48:25 -0500 -0500 (6 minutes ago)
        Local:  7b1afac NVG-1070 chase web next add is card payment to query 2024-11-14 10:51:47 -0500 -0500 (2 minutes ago)
        PR:     https://github.com/doordash/web-next/pull/28303                                                             
                                                                                                                            
      NVG-1076_chase_checkout_fix_country_code_bug                                                                          
        Remote: ae6c6bf Automated rush-prettier fixes 2024-11-14 15:53:15 +0000 +0000 (1 minute ago)                        
        Local:  e5e2b55 [NVG-1076] chase checkout fix country code bug 2024-11-14 10:51:48 -0500 -0500 (2 minutes ago)      
        PR:     https://github.com/doordash/web-next/pull/29805                                                             
                                                                                                                            
  ✓ No merged branches to delete                                                                                            
                                                                                                                            

~/Projects/web-next/services/consumer-web-next NVG-1070_chase_web_next_add_is_card_payment_to_query ⇣⇡ 16s
» git checkout master                                                       
Switched to branch 'master'
Your branch is behind 'origin/master' by 111 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

~/Projects/web-next/services/consumer-web-next master ⇣
» git status            
On branch master
Your branch is behind 'origin/master' by 111 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

nothing to commit, working tree clean

I'm confused why the --rebase-to-trunk flag doesn't pull down latest master? I have to manually check out master and then git pull to get latest master.

@draftcode
Copy link
Contributor

We rebase only topic branches on top of the latest master on the remote side. You would notice the remote tracking branch is always updated after av stack sync. We can add an option to rebase the local master, but right now the CLI is not bothering local master as it's not relevant.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants