search

mate-desktop / mate-settings-daemon

MATE settings daemon
https://mate-desktop.org
GNU General Public License v2.0
43 stars 48 forks source link

Change url project's website #277

Closed tamplan closed 5 years ago

tamplan commented 5 years ago

Now the official web site is https://mate-desktop.org/.

raveit65 commented 5 years ago

All this PRs are looking fine except the spelling mistake in commit header. projet's website should be project's website. You did that in a lot of PRs. Should i really merge them? Everbody will see that when browsing in git history. I can give you advice to change that without deleting your branch or repo. It can be simply done with the git rebase -i <last-commit-id-before-your-pr> Call me here or at irc freenode channel mate-dev for help.

raveit65 commented 5 years ago

@tamplan ping

tamplan commented 5 years ago

I try to rebase the 2 commits in 1 with gitkraven but i don't understand if i need to do this twice, one in my local repository and another in the remote github repository. I need to learn more and practice less quickly...

raveit65 commented 5 years ago

ok.

  1. git rebase -i <last-commit-id-before-your-pr> in your local repo.
  2. choose reword the commit in VI editor and close VI editor with:wg
  3. Now another VI editor is open where you can reword the commit. Do your changes and close VI with :wg
  4. Now do in terminal git push -f (force). This will update (override) your remote repo at github and PR will be updated automatic. Be careful with the -f (--force) option. This can't be undo.

Hope this explanation helps. Feel free to ask again.

tamplan commented 5 years ago

Ok, i'll try for the future in case i need to resolve this.

Thanks you very much for your help!

raveit65 commented 5 years ago

Oh, you wasn't successful. I will edit commit message for you.

PS: there are a lot of git guides at the web for lerning git commands.. And believe me working at the terminal with command line is much powerful than with GUI tools.

raveit65 commented 5 years ago

Reworded and merged. https://github.com/mate-desktop/mate-settings-daemon/commit/638dcf8259cdf6a4d966db5c5c7212a1ae551533