search

juliushaertl / direct_menu

Nextcloud/OwnCloud app to provide easy access to all apps in the header
GNU Affero General Public License v3.0
17 stars 8 forks source link

IE Workaround for Issues/7 #8

Closed TheAgentK closed 9 years ago

juliushaertl commented 9 years ago

Thanks for this pull request. The speech bubbles look really nice btw.

Can you rebase your commits to clean up a bit, so that there are no merges and file permission changes anymore. And please also fix the indentation issues in your changes.

TheAgentK commented 9 years ago

wen i have some time, i try to cleanup my commits.

what do you mean to remove the merges? i merged your changes in my projekt...or what do you mean...i am not very familiar with GIT...so can you explane me what you mean...

I review my code to finde all indentation issues and clean it up.

juliushaertl commented 9 years ago

The usual way would be to create a new branch for your changes. Then you can rebase your branch with the changes from the master. Also try to keep commits in logical units, eg. one for style changes, one for ie fix and so on.

See this for more detail: https://www.atlassian.com/git/tutorials/merging-vs-rebasing/conceptual-overview

If you just want to add parts of a file to a commit to keep the logical structure you can take a look add the "git add -p FILE" command.

I hope this will help you a bit. ;)