EricJoy2048 commented on PR #5402:
URL: https://github.com/apache/seatunnel/pull/5402#issuecomment-1715009206

   > > 
   > 
   > sync fork 
![image](https://user-images.githubusercontent.com/77488507/267045364-bcce0867-a042-41bf-b82e-ed5b262ae236.png)
 git fetch origin (at local) git checkout sql (at local) git rebase dev (at 
local) git push sql (Prompt me whether to merge or rebase, I chose rebase)
   > 
   > like this 
![image](https://user-images.githubusercontent.com/77488507/267053339-f2801e01-6813-4927-8fb6-964d5d0b9107.png)
   
   For you current state, I think you can do it like this:
   ```
   git fetch --all
   git checkout dev
   git pull
   git checkout sql
   git reset --hard bb1371a04599b0f2c421dc97504e6bb43b3ef8f8
   git rebase dev (in this step, you need fix the conflict, and use git rebase 
--continue at the appropriate time)
   git push -f
   ```


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to