*** shmohamud has quit (Ping timeout: 480 seconds) | 02:25 | |
*** shmohamud has quit (Ping timeout: 480 seconds) | 03:32 | |
scooper | Good morning Aaron | 12:28 |
---|---|---|
*** fkoikoi has quit (Ping timeout: 480 seconds) | 12:54 | |
*** fkoikoi has quit (None) | 13:09 | |
*** fkoikoi has quit (Remote host closed the connection) | 13:23 | |
*** fkoikoi has quit (Remote host closed the connection) | 13:26 | |
jelkner | Good day fkoikoi and scooper! | 13:27 |
jelkner | tmickelson is about to log on | 13:27 |
jelkner | i have a *busy* day today | 13:28 |
scooper | Good morning Jeff | 13:28 |
jelkner | with a meeting in the main building at 10 am (2 pm your time) | 13:28 |
jelkner | so if you need anything from me, it needs to be now | 13:28 |
scooper | ok understand | 13:28 |
scooper | First thanks for everything | 13:28 |
jelkner | scooper, we talked about Java questions yesterday | 13:28 |
jelkner | oh, you're most welcome, scooper | 13:28 |
tmickelson | hello fkoikoi and scooper | 13:29 |
scooper | we were about to push to the repository yesterday | 13:29 |
jelkner | we are making great progress together, so thank you for everything too! ;-) | 13:29 |
scooper | fkoikoi and myself | 13:29 |
jelkner | nice | 13:29 |
jelkner | perhaps you can work with tmickelson today | 13:29 |
scooper | Next on our agenda is is show the other when we meet tomorrow | 13:29 |
jelkner | i think i'll have less interruptions tomorrow | 13:30 |
scooper | If they know it by tomorrow them we all can start pushing to our project we have on hand | 13:30 |
scooper | Like the Rural Cookie Stove Website | 13:31 |
scooper | Good morning tmickelson | 13:31 |
tmickelson | good morning scooper | 13:32 |
scooper | Thanks for everything | 13:32 |
scooper | Now freena can push to the repository | 13:33 |
scooper | Is there any git lesson for today | 13:33 |
*** fkoikoi has quit (Ping timeout: 480 seconds) | 13:35 | |
fkoikoi | Hello Jeff | 13:36 |
fkoikoi | Hello tmickelson | 13:36 |
tmickelson | hello fkoikoi | 13:36 |
fkoikoi | How are you? | 13:37 |
tmickelson | fkoikoi, did I show you how to merge a fork back | 13:37 |
tmickelson | im good how are you | 13:37 |
scooper | tmickelson | 13:38 |
fkoikoi | no you didn't | 13:38 |
tmickelson | and scooper, did you complete the pull request (merge) | 13:38 |
scooper | Yes I think I did it that day | 13:38 |
scooper | left me see | 13:39 |
tmickelson | fkoikoi, have you made any changes to the repo that you forked from scooper | 13:39 |
fkoikoi | yes | 13:40 |
scooper | tmickelson | 13:41 |
scooper | unfortunately we did completed that instruction that day | 13:41 |
tmickelson | fkoikoi, under the repos title, it says "forked from ..." | 13:41 |
scooper | But I can remember you told me to click on my name and select "pull request from the top right | 13:42 |
tmickelson | fkoikoi, click on the like | 13:42 |
tmickelson | fkoikoi, * click on the link (it says scooper/TestwithWebteam) | 13:43 |
fkoikoi | yes | 13:43 |
tmickelson | then click on pull requests | 13:43 |
tmickelson | then "new pull request" | 13:43 |
fkoikoi | I'm done | 13:44 |
tmickelson | set the pull from to fkoikoi:master | 13:44 |
fkoikoi | +1 | 13:45 |
tmickelson | and click create new pull request | 13:45 |
fkoikoi | +1 | 13:46 |
tmickelson | then set the title and any description and click create pull request | 13:47 |
fkoikoi | okay | 13:48 |
tmickelson | scooper, so you were able to merge your repo back to the one it was forked from? | 13:48 |
scooper | yes | 13:49 |
tmickelson | fkoikoi, what is on your screen | 13:49 |
scooper | because I m seeing "pull from: scooper:master" and merge into: scooper: master | 13:49 |
scooper | Is that the right part right???? | 13:50 |
tmickelson | scooper, what do you want to merge into scooper:master | 13:51 |
fkoikoi | It says " fkoikoi wants to merge 2 commits from fkoikoi/TestwithWebteam:master into master" and there is a description box with clos and comment under it | 13:51 |
tmickelson | scooper, set the pull from to what you want to merge into scooper:master | 13:52 |
jelkner | scooper, did you see annie's email from this morning? | 13:52 |
tmickelson | fkoikoi, is there a green button below the description box that says something like create new pull request or finalize pull request | 13:52 |
jelkner | we really need to follow up with tanaka | 13:53 |
scooper | I haven check my email since this morning | 13:53 |
jelkner | that's a project want to make sure we deliver on | 13:53 |
jelkner | we can talk later | 13:53 |
jelkner | i have to run now | 13:53 |
scooper | What time | 13:53 |
scooper | should login | 13:53 |
jelkner | we can talk tomorrow, scooper | 13:54 |
jelkner | at this same time | 13:54 |
scooper | But what about today | 13:54 |
scooper | during meeting time | 13:54 |
jelkner | i'll be here at 3 pm my time | 13:54 |
jelkner | gotta go now | 13:54 |
scooper | ok | 13:54 |
jelkner | ACTION logs off til 3 pm | 13:54 |
*** jelkner has quit (Quit: Leaving) | 13:54 | |
fkoikoi | tmickelson there is a green button below but it says comment | 13:54 |
tmickelson | nevermind | 13:55 |
scooper | can I come in a little while??? | 13:55 |
tmickelson | i see the pull request now | 13:55 |
tmickelson | what do you meand scooper | 13:56 |
tmickelson | * mean | 13:56 |
scooper | from the "pull from : scooper: master | 13:56 |
scooper | if I click on it what next | 13:56 |
tmickelson | what do you want to merge from | 13:57 |
scooper | the first item I pull the last time | 13:57 |
scooper | Because I seeing filter branch | 13:57 |
scooper | When I click on the drop down icon | 13:58 |
tmickelson | if you have any branches or forks you want to merge into scooper:master, that is how you select them | 13:58 |
tmickelson | i have to go now | 13:59 |
scooper | So that mean I m at the right place right??? | 13:59 |
scooper | OK | 13:59 |
tmickelson | yes you are in the right place to merge things in | 13:59 |
tmickelson | bye | 13:59 |
scooper | ok | 13:59 |
*** tmickelson has quit (Quit: leaving) | 13:59 | |
scooper | Thanks | 14:00 |
*** scooper has quit (Ping timeout: 480 seconds) | 14:11 | |
*** sysadmin_ has quit (Quit: Leaving) | 14:18 | |
*** fkoikoi has quit (Ping timeout: 480 seconds) | 14:24 | |
*** jelkner has quit (None) | 20:47 | |
scooper | Hello Aaron | 21:03 |
scooper | how are you doing | 21:03 |
*** scooper has quit (Quit: Leaving) | 21:48 |
Generated by irclog2html.py 2.17.3 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!