[GitHub] [guacamole-server] necouchman commented on issue #159: GUACAMOLE-465: beginning to support new codecs and containers

[GitBox <gi...@apache.org>]

necouchman commented on issue #159: GUACAMOLE-465: beginning to support new codecs and containers
URL: https://github.com/apache/guacamole-server/pull/159#issuecomment-581165866
 
 
   From a completely logistical point of view, you've merged the master code into this branch, which has resulted in an extra commit in your pull request (f058286).  My guess is that you were trying to re-incorporate the upstream changes, which is good, but the way to do this is to rebase your branch on top of master, and handle any conflicts.  So, you'd:
   * Make sure your fork of the master branch is up-to-date ("git pull --ff-only upstream/master", where upstream is either the upstream repository or the github.com/apache/guacamole-server mirror)
   * Checkout your branch (guacenc_libavformat)
   * git rebase master
   * Once you've handled all of the conflicts and such, do a force push of that branch.
   
   Let me know if you need any help with that - it can be a bit challenging the first time or two.

----------------------------------------------------------------
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.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services