IRC log of #novawebdev for Monday, 2018-02-19

*** replaceafill has joined #novawebdev10:15
*** zOnny has joined #novawebdev11:43
*** mr_german has joined #novawebdev11:45
zOnnyhey replaceafill12:15
replaceafillhey zOnny12:16
zOnnyCan you check my commits , replaceafill12:20
replaceafillzOnny, will you be around in 10 minutes? i'm finishing something12:22
zOnnysure , replaceafill12:22
replaceafillzOnny, back12:38
replaceafillzOnny, ok, checking12:38
zOnnyI have couple questions about git replaceafill12:39
replaceafillzOnny, yes?12:39
zOnnyeverytime that I want to start a different issue , Do I need to get a new branch from master ? replaceafill12:41
replaceafillzOnny, ideally yes12:41
replaceafillzOnny, sometimes you'll work on features that depend on other features getting merged first12:41
replaceafillzOnny, but it's less painful to plan things as separate as possible12:42
replaceafillzOnny, and develop accordingly12:42
replaceafillzOnny, in your commits for instance12:42
replaceafillzOnny, https://gitlab.com/novawebdevelopment/tendenci-theme-ora/commit/bc0e3fd61092b7e79f410b1c5e70a01eb02fd0b912:42
zOnnyok , replaceafill12:42
replaceafillzOnny, i don't agree with this commit at all12:42
replaceafillzOnny, what is *this* merge request about?12:43
replaceafillzOnny, it's about "add_event_form", right?12:44
zOnnyno, replaceafill12:44
replaceafillzOnny, what does the dashboard have to do with that?12:44
zOnnyit is about the dashboard admin replaceafill12:44
replaceafillzOnny, i understand the change is about the dashboard12:45
zOnnythat is what I want to start to do replaceafill12:45
replaceafillzOnny, i don't agree that the change is included in your add *****event form***** branch12:45
zOnnystart diferent features for different things , replaceafil12:45
replaceafillzOnny, look at this: https://gitlab.com/novawebdevelopment/tendenci-theme-ora/commits/edzon.quinteros/add_event_form12:45
replaceafillzOnny, that branch is supposed to be for changes to the add events form12:46
replaceafillzOnny, that's it12:46
zOnnyyou right, replaceafill12:46
zOnnyI wasnot sure at all about going on different features yet, replaceafill12:47
replaceafillzOnny, sure, i understand12:47
replaceafillzOnny, branches can have as many commits as you want12:47
replaceafillzOnny, if a fix will take just one line, it's ok to do it in a new branch12:48
replaceafillzOnny, and request a merge on it12:48
replaceafillzOnny, it's completely fine12:48
replaceafillzOnny, but they should be related to one thing or related set of things12:49
replaceafillzOnny, not several different things12:49
replaceafillzOnny, do you know how to delete a commit from your branch?12:49
zOnnyyou right, replaceafill12:49
replaceafillzOnny, so you can delete the dashboard one?12:50
zOnnyI can try , replaceafill12:50
replaceafillzOnny, this could help: http://ohshitgit.com/12:52
replaceafillzOnny, i've done the last one "Fuck this noise" so many times :D12:53
zOnnygood title for that , replaceafill12:53
replaceafillzOnny, i still think your inclusion of css/global.css as it is will bring trouble in the future13:10
replaceafillzOnny, https://gitlab.com/novawebdevelopment/tendenci-theme-ora/blob/edzon.quinteros/add_event_form/css/global.css13:10
replaceafillzOnny, see line 62?13:10
replaceafillzOnny, DASHBOARD ADMIN MENU13:10
replaceafillzOnny, it makes me think that the following selectors should be applied to the dashboard *only*13:11
zOnnyI will fix that , replaceafill13:11
replaceafillzOnny, however selectors like .table ... {13:12
replaceafillzOnny, will affect a bunch of Tendenci template views13:12
replaceafillzOnny, so i don't think this is enough yet: https://gitlab.com/novawebdevelopment/tendenci-theme-ora/commit/2b9538c422ca0aa67c4bf5966b7b58a5f26a6ca413:13
zOnnyeven if they have specific descendants ? replaceafill13:13
replaceafillzOnny, even then13:13
replaceafillzOnny, the problem is the starting point of the selector13:13
replaceafillzOnny, for example "tbody > tr > td:nth-child(3)"13:14
replaceafillzOnny, that'll affect most of the tables13:14
replaceafillzOnny, if the selector was supposed to target the add event form13:15
replaceafillzOnny, a better selector would have been "#some-id-for-the-form tbody > tr > td:nth-child(3)"13:15
zOnnyok, replaceafill13:16
replaceafillzOnny, same for the dashboard, etc13:16
replaceafillzOnny, oh, i suggested this in the merge request: Maybe start them with "#t-events-form"?13:16
replaceafillzOnny, you should try that and see if it works13:17
replaceafillzOnny, instead of my fictitious #some-id-for-the-form :)13:17
replaceafillzOnny, ok, anything else you need?13:17
zOnnyno replacaefill, I will work on that, thanks13:18
zOnny*replaceafill13:19
replaceafillzOnny, cool, keep going!13:19
replaceafillACTION goes to pick his daugther, bb in ~3013:19
*** zOnny has joined #novawebdev16:03
zOnnyreplaceafill ?16:04
replaceafillhey zOnny16:04
zOnnyI got trouble :)16:05
replaceafillzOnny, what trouble?16:06
zOnnyCan I get a new feature from edzon.quinteros/add_event_form instead of master ? replaceafill 16:08
replaceafillzOnny, a new feature_16:08
replaceafill_16:08
replaceafill_16:08
replaceafill?16:08
replaceafillwhat's wrong with my keyboard...?16:09
replaceafill:)16:09
zOnnyhaving a new branch from master, it keeps as master is right now.16:09
replaceafillzOnny, can you explain what you want to do?16:11
zOnnyI want to be familiar creating different branches with different issues on , replaceafill16:11
replaceafillzOnny, ok, you start with "checkout master", right?16:12
replaceafillgit checkout master16:12
replaceafilland make sure there are no staged changes16:12
zOnnyok16:13
replaceafillgit status should say something like your branch is up to date16:13
zOnnyright16:13
replaceafillzOnny, then you *create* a new branch for the feature or fix you're going to work on16:13
zOnnyright16:13
replaceafillgit checkout -b zOnny/add_event_form16:13
replaceafillthen you start working making changes and commits16:14
replaceafillyou may push, etc16:14
replaceafillsuppose you're not done yet16:14
replaceafillbut want to work on something else in the same project16:14
replaceafillyou can:16:14
replaceafillgit checkout master16:14
replaceafillagain, make sure the state is clean with "git status"16:15
replaceafilland you can just create a new branch for the other fix/feature16:15
replaceafillgit checkout -b dashboard_fix16:15
zOnnybut how you combine all branches once you make the merge request ? replaceafill16:15
replaceafillthen you can start working on that, ignoring the add_event_form16:16
replaceafillzOnny, you don't16:16
replaceafillzOnny, once something is merged to master16:16
replaceafillzOnny, you just pull master to your local copy16:16
replaceafillgit checkout master16:16
replaceafillgit pull origin master16:16
replaceafilland the merged changes will come16:16
replaceafillzOnny, why do you want to *combine* all branches?16:17
zOnnyno, I don't want to combine16:17
zOnnyit just a question16:17
zOnnybecause of many branches on16:18
replaceafillzOnny, master should represent all the branches you have had approved16:18
replaceafillzOnny, they're merged to it16:18
replaceafillzOnny, suppose you finish your add_event_form work16:18
replaceafillzOnny, we review it and it looks good16:18
replaceafillzOnny, we merge it to master16:19
zOnnybut I don't need to make the same changes that the other branches have right?16:19
replaceafillzOnny, no16:19
zOnnyok, replaceafill16:19
replaceafillzOnny, now suppose you want something from master that was merged yesterday16:19
replaceafillzOnny, but you don't have in your add_event_form or dashboard_fix branch16:20
replaceafillzOnny, in that case you need to "rebase" or "merge" master to your branch16:21
replaceafillzOnny, you can read about their differences: https://www.atlassian.com/git/tutorials/merging-vs-rebasing16:21
replaceafillzOnny, see this: https://www.atlassian.com/dam/jcr:e229fef6-2c2f-4a4f-b270-e1e1baa94055/02.svg16:22
zOnnythanks, replaceafill16:22
replaceafillzOnny, that's what happens when you want something new from master in your branch16:22
replaceafillzOnny, my personal preference is to use rebase over merge16:23
replaceafillzOnny, but it depends on your use case really16:23
replaceafillzOnny, the goal should always be to not pollute your history so much16:23
zOnnyok , replaceafill16:24
replaceafillzOnny, but see that page and the "Golden Rule of Rebasing"16:24
replaceafillzOnny, once multiple developers are working on a repo16:24
zOnnyyes , I will16:24
replaceafillzOnny, you need to pay attention to what you do with master and be careful16:25
replaceafillzOnny, because if you change history in a incompatible way, like rebase does, then you're going to break other people's copies16:25
zOnnycareful ? :(16:25
zOnnyI will test that in a different project , replaceafill16:26
replaceafillzOnny, cool, and don't feel overwhelmed with git16:27
replaceafillzOnny, it's very complicated at the beginning16:27
replaceafillzOnny, do what's simplest for you16:27
replaceafillzOnny, again, you can create as many branches as you want and move files around at will if you're in your own branch16:27
replaceafillzOnny, some day you'll learn to "amend" history16:28
replaceafillzOnny, squash commits, etc16:28
replaceafillzOnny, and yes, testing all of this in dummy projects helps16:28
replaceafillzOnny, that's usually what i do when i don't remember how something works16:28
zOnnyto much information for now , my brain is still processing .....16:30
replaceafillzOnny, :D16:30
replaceafillzOnny, sorry ;)16:30

Generated by irclog2html.py 2.17.2 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!