necouchman commented on PR #728: URL: https://github.com/apache/guacamole-client/pull/728#issuecomment-1198097792
@Niubbo75 There are still many conflicts. My guess is that your forked Master repository is out of sync with the Apache one - so you'll need to add the Apache repo to your local copy and "fast-forward" your git master with those changes. I know how to do that when the commits are on their own branch - I'm not exactly sure how to do it when you've committed to your master branch without wiping out your changes. -- 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]
