Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for right alt key (altgr) #379

Merged
merged 7 commits into from
Dec 18, 2015
Merged

Conversation

yasammez
Copy link

I currently don't have access to english and french keyboards, so the altgr-mappings for these layouts might be flawed. But this can easily be fixed afterwards.

@polymetric
Copy link
Contributor

Suggestion: You're doing alot of merging to sync your local repository, try rebasing instead (git pull --rebase upstream master or git fetch upstream master; git rebase upstream/master).

@yasammez
Copy link
Author

Yeah, At my current workplace, we aren't allowed to rebase, so I kinda lost the habit. I'll try to remember it in the future.

@ticki
Copy link
Contributor

ticki commented Dec 16, 2015

@polymetric1 Why don't merge? It gives better history than rebasing.

@polymetric
Copy link
Contributor

@ticki The problem with this is that it creates useless commits that are added to pull requests that do nothing. It's fine for merging branch-x with the master branch, hence the name, but when you're syncing a branch with the master, it's better to 1. just don't, or 2. rebase, than to merge. You shouldn't always merge and you shouldn't always rebase. This is kind of a bad explanation but I hope you understand what i mean

@jackpot51
Copy link
Member

I cannot merge this because it backrevs the rust submodule.

You will need to

cd rust
git checkout master
git pull

And resubmit

@polymetric
Copy link
Contributor

Merging also causes problems like this ^
The only commits that don't do nothing or revert history are the first and last ones in this PR. You might consider just completely removing those from the PR.

@ghost
Copy link

ghost commented Dec 18, 2015

@polymetric
Copy link
Contributor

  • Rebase when pulling upstream changes
  • Merge when finishing a separate feature branch

Couldn't have said it better.
Actually I tried to explain it, I'm just that bad at explaining things.
Thanks @stratact

@ticki
Copy link
Contributor

ticki commented Dec 18, 2015

Rebase when pulling upstream changes

Of course.

jackpot51 added a commit that referenced this pull request Dec 18, 2015
Add support for right alt key (altgr)
@jackpot51 jackpot51 merged commit 90ff781 into redox-os:master Dec 18, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants