amygbAI commented on PR #518:
URL: 
https://github.com/apache/incubator-graphar/pull/518#issuecomment-2182058566

   after making the changes when i tried to push git showed me some conflicts 
and after gpt + google search i followed the below
   
   git stash
    git pull origin 170-feat-support-json-payload-file-format
    git stash pop
   git add .
   git commit -m "msg"
   git push origin 170-feat-support-json-payload-file-format
   
   for some reason now it shows some conflict in the scripts file AND also in 
the cpp file filesystem.cc .. totally confused


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


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to