-
Notifications
You must be signed in to change notification settings - Fork 38
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
Action Bugfixes & Support for Action Icons #98
base: master
Are you sure you want to change the base?
Conversation
@ValentijnvdBeek As you can see this PR has merge conflicts. That's not good for merging. p.s. At any time did I well with you, or anybody else. |
@luis-pereira It shouldn't have any merge conflicts (or at least Github says it has none) but honestly I am not terribly surprised since Git really dislikes it when somebody mucks around with it's history. I don't think we'll ever agree on this point but I still think you made some mistakes that it would suit you to recognize and fix as I do with my own. If only to appeal more to new contributors because I would have loved to do some more work on this project but I really don't want to work with people who tell me that I have unmet emotional needs that I am forcing on people. Surprisingly enough I am also a person with a limited amount of hours in a day. |
It can't be rebased - it should be in a state that can be rebased - so, where is the problem? |
9e5369d
to
6ff94e1
Compare
@agaida I just did exactly what he asked me to do without complaining? I just said that Github said it could be merged but that I wouldn't be surprised if it is wrong since Git really dislikes it when you change the history in any way. I was saying he was right. |
@ValentijnvdBeek After 6ff94e1 it hasn't merge conflicts.
I really can't understand the meaning of it. I don't know what you are talking about. You don't explain. Exactly when did I say that you "have unmet emotional needs that I am forcing on people" ? |
@luis-pereira It said before, on Github, that "This branch had no conflict with the base branch" but that doesn't really matter anymore since I already changed it. I still have the original code so I could prove it but I really don't think that every single should have a massive fight associated with it. "Yes, of course. But you seem to have emotional demands. Here is not the place for them.". |
@ValentijnvdBeek We agree that I didn't say that. So, why bring it up here ? The first thing that comes to mind is: How do I test this ? You changed the commend style (and apparently only that), why ? In any case style changes should be placed in it's own commit. https://github.com/lxqt/lxqt/wiki/Contributing-code#clean-commits ... to be continued, real life calls |
@luis-pereira Because somebody who is a member of LXQt who speaks on an official LXQt channel with the label The problem with writing a test is that the current way that I uncommented those lines for testing reasons and recommented them when I was finished. I didn't end up doing them at exactly the same place but since it is very small change and didn't impact the code at all I ended up leaving it be. Also the thing you linked doesn't actually say that but instead says:
Style changes are neither fixes or features so they don't fall under this rule but that is minor nitpick. My bigger crime in this department is that my commit adds a feature and fixes a bug (which was just two lines) which I can fix if you want. The same document also states:
Which I think implies that those lines that were changed shouldn't be there to begin with since they are commented debug statements. So if you want me to change them, I should probably go all the way and delete them outright. |
Again! (1) Hoping to stop wasting of time (which has become very irrelevant now), in a comment, I said what was correctly quoted above. Even if one equates "demand" with "need" and freely adds the word "unmet" to it, there's nothing in that comment telling that "emotional needs" are wrong or denying that all people on earth may have "unmet emotional needs" -- whatever that phrase may mean or however it's coined. The emphasis was on the place. (2) Rationally, if I'm a reproachable person, that says nothing about an organization I work with, a toolkit I use, a piece of code I write, etc. Irrationally, everything is related to everything. (3) Apparently, @ValentijnvdBeek can continue this ad infinitum. The only one who can stop him is himself. |
@tsujan I wasn't the person who started this conversation up again and I was hoping that we could avoid it since we are never going to agree. Now that we all had our say can we go back to determining that I am both a terrible person AND a terrible programmer :) |
@ValentijnvdBeek It's your choice to interpret things that way. I can just use words and say that only codes are important here. |
I'm Portuguese and by your logic I endorse everything the elected government states !
That pollutes the history. If it does nothing, why should it be there ? It's as simple as that. BTW I just don't know where the terrible person and terrible programmer. |
6ff94e1
to
4f8b9a3
Compare
@ValentijnvdBeek: You might find it unkind, but you should work on your code/noise ratio. Nobody is pissed about some hard contributors rants if the ratio is 1/(current ratio). Right now it is a pain to read for every potential reviewer. |
Not exactly, but close. It wasn't able to test actions at all which my pull request touches on.
I just pushed a commit which ports the existing tests to Python 3 and added another test for actions.
You asked me why and I answered your question. I just amended the commit since I didn't have the time do so before (maths exam). |
Back from vacation. Will review ASAP. |
I removed the translation changes and cleaned up one of the commits (I genuinely don't know why git decided to add the translation changes to it).
Hopefully they are clean enough now, however it did pull together the commit fixing the bug where actions wouldn't update and the commit where I added the action-icon action. Hopefully these are close enough together that I don't have to pull them further apart because wrestling with git hasn't been fun..
However if you do want them or anything else separate (or any other chances) I would love to hear it of course. I could also separate them as separate pull requests but that still strikes me as a bit weird.
I closed the last PR for the clean commit history. Feel free to keep yelling at me.
EDIT: Also take your time and enjoy your vacation.