search

FreeRDP / FreeRDP-WebConnect

A gateway for seamless access to your RDP-Sessions in any HTML5-compliant browser
519 stars 1.62k forks source link

Fix compilation issues in VS2015 #144

Closed langazov closed 7 years ago

alexpilotti commented 8 years ago

Looking good, if you could please fix those small formatting nits, it's good to merge

langazov commented 8 years ago

Hello , I haven't contributed to other projects yet, can you please advise what will be best way for you to do it ? Do I have to make a new pull request ? Sorry if my question sounds dumb, just new to this :)

c64cosmin commented 8 years ago

@langazov There are two ways: You could add a new commit with the changes, and the pull request will be updated automatically (pull requests keep track of a certain branch, in your case is master) Best way is to use rebasing: For example if I want to go back in time and change some commits, let's say 2 commits I will execute git rebase -i HEAD~2 (-i stands for interactive, it will show up a editable text file where you can cherry pick the commits and what to do with them you will want to edit them, thus 'edit' or 'e' will be added)

now by using git log or 'git show' you can see on which commit you are on Edit the files and then commit.

After the commit is replaced, you will want to continue rebasing, you will use git rebase --continue to go to the next commit you can also use if you are under a commit that you want to skip git rebase --skip

After rebasing has been done, you will need to overwrite the old commits, by force pushing to your repository git push -f <remote> <branch>

langazov commented 8 years ago

Thank you very much, I will edit them little later today :)