necouchman commented on PR #925: URL: https://github.com/apache/guacamole-client/pull/925#issuecomment-1804084266
> Hi @necouchman, i don't really understand what i need to do on the second point. Can you give me some instructions on how to do it? > > [staging/1.5.4...divendres:guacamole-client:staging/1.5.4](https://github.com/apache/guacamole-client/compare/staging/1.5.4...divendres:guacamole-client:staging/1.5.4) I can only change where i want to commit but not from which branch. Should i do a new one? You can do a `git rebase staging/1.5.4`, which will rebase your changes on top of the `staging/1.5.4` branch. However, because you've started with the `master` branch, which is both ahead of but has also diverged from the `staging/1.5.4` branch, this could get a bit complex - there may be extra commits or rebase conflicts that show up when you try to do this. Also, you're making the changes to your `master` branch within your fork, which isn't ideal when you want to make changes to a different branch. So, my overall guidance would be to: * From your current fork/master branch, do: `git checkout -b working/catalan-translation-updates` * `git rebase staging/1.5.4` * This rebase may cause a bunch of conflicts that have to be resolve, so work through those. * Push changes to your remote fork. * Create a new pull request from your new branch, that is targeted toward the `apache:staging/1.5.4` branch instead of `apache:master` for the merge. Hopefully this helps? Feel free to ask any further questions if anything is unclear. -- 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: dev-unsubscr...@guacamole.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
