surfskidude commented on code in PR #3071: URL: https://github.com/apache/nuttx-apps/pull/3071#discussion_r2082849781
########## examples/xedge/xedge_main.c: ########## @@ -0,0 +1,207 @@ +/**************************************************************************** + * xedge_main.c + * + * Copyright (C) 2025. All rights reserved. Review Comment: I tried, but it failed. Sorry, I am no git expert. git rebase -i HEAD~11 Auto-merging examples/xedge/Kconfig CONFLICT (add/add): Merge conflict in examples/xedge/Kconfig Auto-merging examples/xedge/xedge_main.c CONFLICT (add/add): Merge conflict in examples/xedge/xedge_main.c error: could not apply 055fcfca1... Adding new example Xedge hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 055fcfca1... Adding new example Xedge -- 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-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
