You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@daffodil.apache.org by GitBox <gi...@apache.org> on 2022/09/06 14:42:49 UTC

[GitHub] [daffodil-vscode] stevedlawrence commented on pull request #278: Choice fix

stevedlawrence commented on PR #278:
URL: https://github.com/apache/daffodil-vscode/pull/278#issuecomment-1238250572

   This PR has merge commits and and a lot more changes in it than just a fix to choices. Please rebase your changes to the latest asf/main branch and remove the merge commits and update the PR>
   
   We have a pretty thoroughly documented workflow for Daffodil that should be used for this repo as well:
   
   https://cwiki.apache.org/confluence/display/DAFFODIL/Code+Contributor+Workflow
   
   That helps to avoid this issues with merge commits and unintended changes added to a PR. I would especially recommend never running `git pull`. For some reason it's what everyting online says to use, but it really just causes issues and should be avoided. The mentioned workflow never uses `git pull`.


-- 
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: commits-unsubscribe@daffodil.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org