| *** replaceafill has joined #novawebdev | 10:15 | |
| *** zOnny has joined #novawebdev | 11:43 | |
| *** mr_german has joined #novawebdev | 11:45 | |
| zOnny | hey replaceafill | 12:15 |
|---|---|---|
| replaceafill | hey zOnny | 12:16 |
| zOnny | Can you check my commits , replaceafill | 12:20 |
| replaceafill | zOnny, will you be around in 10 minutes? i'm finishing something | 12:22 |
| zOnny | sure , replaceafill | 12:22 |
| replaceafill | zOnny, back | 12:38 |
| replaceafill | zOnny, ok, checking | 12:38 |
| zOnny | I have couple questions about git replaceafill | 12:39 |
| replaceafill | zOnny, yes? | 12:39 |
| zOnny | everytime that I want to start a different issue , Do I need to get a new branch from master ? replaceafill | 12:41 |
| replaceafill | zOnny, ideally yes | 12:41 |
| replaceafill | zOnny, sometimes you'll work on features that depend on other features getting merged first | 12:41 |
| replaceafill | zOnny, but it's less painful to plan things as separate as possible | 12:42 |
| replaceafill | zOnny, and develop accordingly | 12:42 |
| replaceafill | zOnny, in your commits for instance | 12:42 |
| replaceafill | zOnny, https://gitlab.com/novawebdevelopment/tendenci-theme-ora/commit/bc0e3fd61092b7e79f410b1c5e70a01eb02fd0b9 | 12:42 |
| zOnny | ok , replaceafill | 12:42 |
| replaceafill | zOnny, i don't agree with this commit at all | 12:42 |
| replaceafill | zOnny, what is *this* merge request about? | 12:43 |
| replaceafill | zOnny, it's about "add_event_form", right? | 12:44 |
| zOnny | no, replaceafill | 12:44 |
| replaceafill | zOnny, what does the dashboard have to do with that? | 12:44 |
| zOnny | it is about the dashboard admin replaceafill | 12:44 |
| replaceafill | zOnny, i understand the change is about the dashboard | 12:45 |
| zOnny | that is what I want to start to do replaceafill | 12:45 |
| replaceafill | zOnny, i don't agree that the change is included in your add *****event form***** branch | 12:45 |
| zOnny | start diferent features for different things , replaceafil | 12:45 |
| replaceafill | zOnny, look at this: https://gitlab.com/novawebdevelopment/tendenci-theme-ora/commits/edzon.quinteros/add_event_form | 12:45 |
| replaceafill | zOnny, that branch is supposed to be for changes to the add events form | 12:46 |
| replaceafill | zOnny, that's it | 12:46 |
| zOnny | you right, replaceafill | 12:46 |
| zOnny | I wasnot sure at all about going on different features yet, replaceafill | 12:47 |
| replaceafill | zOnny, sure, i understand | 12:47 |
| replaceafill | zOnny, branches can have as many commits as you want | 12:47 |
| replaceafill | zOnny, if a fix will take just one line, it's ok to do it in a new branch | 12:48 |
| replaceafill | zOnny, and request a merge on it | 12:48 |
| replaceafill | zOnny, it's completely fine | 12:48 |
| replaceafill | zOnny, but they should be related to one thing or related set of things | 12:49 |
| replaceafill | zOnny, not several different things | 12:49 |
| replaceafill | zOnny, do you know how to delete a commit from your branch? | 12:49 |
| zOnny | you right, replaceafill | 12:49 |
| replaceafill | zOnny, so you can delete the dashboard one? | 12:50 |
| zOnny | I can try , replaceafill | 12:50 |
| replaceafill | zOnny, this could help: http://ohshitgit.com/ | 12:52 |
| replaceafill | zOnny, i've done the last one "Fuck this noise" so many times :D | 12:53 |
| zOnny | good title for that , replaceafill | 12:53 |
| replaceafill | zOnny, i still think your inclusion of css/global.css as it is will bring trouble in the future | 13:10 |
| replaceafill | zOnny, https://gitlab.com/novawebdevelopment/tendenci-theme-ora/blob/edzon.quinteros/add_event_form/css/global.css | 13:10 |
| replaceafill | zOnny, see line 62? | 13:10 |
| replaceafill | zOnny, DASHBOARD ADMIN MENU | 13:10 |
| replaceafill | zOnny, it makes me think that the following selectors should be applied to the dashboard *only* | 13:11 |
| zOnny | I will fix that , replaceafill | 13:11 |
| replaceafill | zOnny, however selectors like .table ... { | 13:12 |
| replaceafill | zOnny, will affect a bunch of Tendenci template views | 13:12 |
| replaceafill | zOnny, so i don't think this is enough yet: https://gitlab.com/novawebdevelopment/tendenci-theme-ora/commit/2b9538c422ca0aa67c4bf5966b7b58a5f26a6ca4 | 13:13 |
| zOnny | even if they have specific descendants ? replaceafill | 13:13 |
| replaceafill | zOnny, even then | 13:13 |
| replaceafill | zOnny, the problem is the starting point of the selector | 13:13 |
| replaceafill | zOnny, for example "tbody > tr > td:nth-child(3)" | 13:14 |
| replaceafill | zOnny, that'll affect most of the tables | 13:14 |
| replaceafill | zOnny, if the selector was supposed to target the add event form | 13:15 |
| replaceafill | zOnny, a better selector would have been "#some-id-for-the-form tbody > tr > td:nth-child(3)" | 13:15 |
| zOnny | ok, replaceafill | 13:16 |
| replaceafill | zOnny, same for the dashboard, etc | 13:16 |
| replaceafill | zOnny, oh, i suggested this in the merge request: Maybe start them with "#t-events-form"? | 13:16 |
| replaceafill | zOnny, you should try that and see if it works | 13:17 |
| replaceafill | zOnny, instead of my fictitious #some-id-for-the-form :) | 13:17 |
| replaceafill | zOnny, ok, anything else you need? | 13:17 |
| zOnny | no replacaefill, I will work on that, thanks | 13:18 |
| zOnny | *replaceafill | 13:19 |
| replaceafill | zOnny, cool, keep going! | 13:19 |
| replaceafill | ACTION goes to pick his daugther, bb in ~30 | 13:19 |
| *** zOnny has joined #novawebdev | 16:03 | |
| zOnny | replaceafill ? | 16:04 |
| replaceafill | hey zOnny | 16:04 |
| zOnny | I got trouble :) | 16:05 |
| replaceafill | zOnny, what trouble? | 16:06 |
| zOnny | Can I get a new feature from edzon.quinteros/add_event_form instead of master ? replaceafill | 16:08 |
| replaceafill | zOnny, a new feature_ | 16:08 |
| replaceafill | _ | 16:08 |
| replaceafill | _ | 16:08 |
| replaceafill | ? | 16:08 |
| replaceafill | what's wrong with my keyboard...? | 16:09 |
| replaceafill | :) | 16:09 |
| zOnny | having a new branch from master, it keeps as master is right now. | 16:09 |
| replaceafill | zOnny, can you explain what you want to do? | 16:11 |
| zOnny | I want to be familiar creating different branches with different issues on , replaceafill | 16:11 |
| replaceafill | zOnny, ok, you start with "checkout master", right? | 16:12 |
| replaceafill | git checkout master | 16:12 |
| replaceafill | and make sure there are no staged changes | 16:12 |
| zOnny | ok | 16:13 |
| replaceafill | git status should say something like your branch is up to date | 16:13 |
| zOnny | right | 16:13 |
| replaceafill | zOnny, then you *create* a new branch for the feature or fix you're going to work on | 16:13 |
| zOnny | right | 16:13 |
| replaceafill | git checkout -b zOnny/add_event_form | 16:13 |
| replaceafill | then you start working making changes and commits | 16:14 |
| replaceafill | you may push, etc | 16:14 |
| replaceafill | suppose you're not done yet | 16:14 |
| replaceafill | but want to work on something else in the same project | 16:14 |
| replaceafill | you can: | 16:14 |
| replaceafill | git checkout master | 16:14 |
| replaceafill | again, make sure the state is clean with "git status" | 16:15 |
| replaceafill | and you can just create a new branch for the other fix/feature | 16:15 |
| replaceafill | git checkout -b dashboard_fix | 16:15 |
| zOnny | but how you combine all branches once you make the merge request ? replaceafill | 16:15 |
| replaceafill | then you can start working on that, ignoring the add_event_form | 16:16 |
| replaceafill | zOnny, you don't | 16:16 |
| replaceafill | zOnny, once something is merged to master | 16:16 |
| replaceafill | zOnny, you just pull master to your local copy | 16:16 |
| replaceafill | git checkout master | 16:16 |
| replaceafill | git pull origin master | 16:16 |
| replaceafill | and the merged changes will come | 16:16 |
| replaceafill | zOnny, why do you want to *combine* all branches? | 16:17 |
| zOnny | no, I don't want to combine | 16:17 |
| zOnny | it just a question | 16:17 |
| zOnny | because of many branches on | 16:18 |
| replaceafill | zOnny, master should represent all the branches you have had approved | 16:18 |
| replaceafill | zOnny, they're merged to it | 16:18 |
| replaceafill | zOnny, suppose you finish your add_event_form work | 16:18 |
| replaceafill | zOnny, we review it and it looks good | 16:18 |
| replaceafill | zOnny, we merge it to master | 16:19 |
| zOnny | but I don't need to make the same changes that the other branches have right? | 16:19 |
| replaceafill | zOnny, no | 16:19 |
| zOnny | ok, replaceafill | 16:19 |
| replaceafill | zOnny, now suppose you want something from master that was merged yesterday | 16:19 |
| replaceafill | zOnny, but you don't have in your add_event_form or dashboard_fix branch | 16:20 |
| replaceafill | zOnny, in that case you need to "rebase" or "merge" master to your branch | 16:21 |
| replaceafill | zOnny, you can read about their differences: https://www.atlassian.com/git/tutorials/merging-vs-rebasing | 16:21 |
| replaceafill | zOnny, see this: https://www.atlassian.com/dam/jcr:e229fef6-2c2f-4a4f-b270-e1e1baa94055/02.svg | 16:22 |
| zOnny | thanks, replaceafill | 16:22 |
| replaceafill | zOnny, that's what happens when you want something new from master in your branch | 16:22 |
| replaceafill | zOnny, my personal preference is to use rebase over merge | 16:23 |
| replaceafill | zOnny, but it depends on your use case really | 16:23 |
| replaceafill | zOnny, the goal should always be to not pollute your history so much | 16:23 |
| zOnny | ok , replaceafill | 16:24 |
| replaceafill | zOnny, but see that page and the "Golden Rule of Rebasing" | 16:24 |
| replaceafill | zOnny, once multiple developers are working on a repo | 16:24 |
| zOnny | yes , I will | 16:24 |
| replaceafill | zOnny, you need to pay attention to what you do with master and be careful | 16:25 |
| replaceafill | zOnny, because if you change history in a incompatible way, like rebase does, then you're going to break other people's copies | 16:25 |
| zOnny | careful ? :( | 16:25 |
| zOnny | I will test that in a different project , replaceafill | 16:26 |
| replaceafill | zOnny, cool, and don't feel overwhelmed with git | 16:27 |
| replaceafill | zOnny, it's very complicated at the beginning | 16:27 |
| replaceafill | zOnny, do what's simplest for you | 16:27 |
| replaceafill | zOnny, again, you can create as many branches as you want and move files around at will if you're in your own branch | 16:27 |
| replaceafill | zOnny, some day you'll learn to "amend" history | 16:28 |
| replaceafill | zOnny, squash commits, etc | 16:28 |
| replaceafill | zOnny, and yes, testing all of this in dummy projects helps | 16:28 |
| replaceafill | zOnny, that's usually what i do when i don't remember how something works | 16:28 |
| zOnny | to much information for now , my brain is still processing ..... | 16:30 |
| replaceafill | zOnny, :D | 16:30 |
| replaceafill | zOnny, sorry ;) | 16:30 |
Generated by irclog2html.py 2.17.3 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!
