Page Comparison

[08:57:31 CST(-0600)] <heidi> jamon, having trouble logging into wiki. i did password reset with ocad email and still can't login
[08:58:11 CST(-0600)] <jamon> heidi: wiki.fluidproject.org or wiki.idrc.ocad.ca?
[08:59:35 CST(-0600)] <heidi> jamon my bad - wrong on
[08:59:36 CST(-0600)] <heidi> e
[08:59:46 CST(-0600)] <heidi> fluidproject still utoronto
[08:59:53 CST(-0600)] <jamon> ah
[09:00:03 CST(-0600)] <jamon> next question, would you like your username changed heidi?
[09:00:34 CST(-0600)] <heidi> jamon lik switch fluidwiki to idrc? yes please
[09:01:13 CST(-0600)] <jamon> heidi: what i meant is changing your username on wiki.fluidproject.org
[09:05:44 CST(-0600)] <heidi> thanks jamon
[09:16:38 CST(-0600)] <jamon> np, anyone else?
[09:30:27 CST(-0600)] <golam> does anyone know how I can keep my fork on github up to date with it's origin?
[09:34:51 CST(-0600)] <mlam> golam: I can help you out
[09:35:56 CST(-0600)] <mlam> the first thing you want to do is add a remote repository to the remote master
[09:36:50 CST(-0600)] <mlam> in this case, git remote add upstream https://github.com/fluid-project/infusion.git
[09:37:28 CST(-0600)] <michelled> mlam: I was just looking at your pull request for 4053 - did you intend to make changes to the .project file?
[09:37:46 CST(-0600)] <mlam> the remote repo name of upstream is something that justin_o came up with so that we all use the same terminology for reference.
[09:38:21 CST(-0600)] <mlam> michelled: No, I didn't. I've set my global config for the git ignore, so i'm not sure why the .project file is still showing up
[09:38:53 CST(-0600)] <michelled> thx - I'll just ignore it
[09:38:59 CST(-0600)] <mlam> michelled: ok, thanks
[09:39:31 CST(-0600)] <mlam> golam: now, you want to pull from the upstream into your local master
[09:39:50 CST(-0600)] <mlam> once that is done, you will push your local master changes into your fork
[09:40:16 CST(-0600)] <mlam> that should keep your fork up-to-date with the upstream
[09:40:29 CST(-0600)] <mlam> and you would do the same for all your branches to prevent the branches from getting crusty
[09:42:31 CST(-0600)] <golam> mlam: let's assume that I did that all.. then how do I keep my fork in github uptodate with it's origin?
[09:43:30 CST(-0600)] <mlam> the above steps are what you would need to do to keep your fork up-to-date with the repository that you forked from.
[09:55:25 CST(-0600)] <golam> mlam: just to confirm I will fetch from upstream then merge it with my local master then push to my remote origin
[09:55:38 CST(-0600)] <mlam> yes, that's right
[09:56:03 CST(-0600)] <golam> cool
[10:16:54 CST(-0600)] <heidi> anastasiac this is an interesting page/idea: http://wiki.fluidproject.org/display/fluid/Flutter+without+Fluid
[10:17:44 CST(-0600)] <anastasiac> yes, heidi, the comparison is a nice thing - a good answer to "why infusion?"
[10:18:09 CST(-0600)] <heidi> yep, i like it, could prob flush it out more with the new pluses too
[10:18:30 CST(-0600)] <anastasiac> heidi, I also had an idea for components: jameswy mocked up a visualization application that we might implement as a full framework demo, but it would require components. There might be ideas there for you
[10:19:09 CST(-0600)] <heidi> cool ill ask him about it - we talked a little this morning about upcoming floe/ui options pieces too
[10:19:21 CST(-0600)] <heidi> and talked to jon about decapod wants as well
[10:26:34 CST(-0600)] <michelled> mlam: after talking this through with justin_o it seems to make better sense to get you to make a new branch that doesn't include the .project changes in it. justin_o is going to work with you to figure out why git is including .project changes in your commits
[10:26:56 CST(-0600)] <mlam> Ok sure
[10:27:16 CST(-0600)] <michelled> mlam: otherwise the infusion project repo will have two commits - one where you change the .property file and one where I change it back
[10:27:30 CST(-0600)] <michelled> it's not something I'd do if we were still in svn so I don't think it makes sense to do it now
[10:27:40 CST(-0600)] <michelled> but I could be wrong - this is certainly a new way of working for me
[10:27:48 CST(-0600)] <michelled> perhaps worth a chat today during the dev meeting
[11:34:00 CST(-0600)] <mlam> michelled: I've recreated my fork and adjusted my settings with justin_o's help. The .project file isn't in there anymore. The FLUID-4053 branch is ready . Just making the pull request for it now.
[11:48:44 CST(-0600)] <michelled> thx mlam
[11:48:55 CST(-0600)] <mlam> np
[13:35:25 CST(-0600)] <michelled> fluid-everyone: it's that time of week again
[13:35:52 CST(-0600)] <michelled> fluid-everyone: is there anyone who's not in Toronto that wants to be skyped in?