ShaiviAgarwal2 commented on PR #45160:
URL: https://github.com/apache/arrow/pull/45160#issuecomment-2585039562

   > Hmm. What `git` commands did you use...? There are needless changes...
   > 
   > It may be better that you create a new branch and open a new PR from it.
   
   I use these commands inorder to resolve the conflicts but they didn't work !!
   
   git checkout master
   git pull
   git checkout <branch>
   git merge master
   [ ... resolve any conflicts ... ]
   git add [files that were conflicted]
   git commit
   git push


-- 
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