search

mmonroe-ryffine / teamperl

0 stars 0 forks source link

Test helloWorld.pl #1

Closed philiprbrenan closed 7 years ago

philiprbrenan commented 7 years ago

Please use Git hub to download this project and see if you can run helloWorld.pl on your mac?

mmonroe-ryffine commented 7 years ago

Run! image

philiprbrenan commented 7 years ago

Please modify it to say "Hello to you too" and then try and save it - GitHub should object as I have changed the file since you downloaded it. We can then do a merge.

mmonroe-ryffine commented 7 years ago

Done and merged! Is the merge what you expected?

philiprbrenan commented 7 years ago

On GitHub I see: github1

I would expect to either see your code in branch master, or better a conflict between the two files? Have you pushed?

mmonroe-ryffine commented 7 years ago

I did push, sorry! I made the changes on my desktop and then tried to sync to the shared repo, it wouldn't let me commit without doing the merge so I just went ahead.

philiprbrenan commented 7 years ago

So why do I not see your code? Why do I see just my code? I have refreshed the browser! What do you see at: https://github.com/mmonroe-ryffine/teamperl/blob/master/helloWorld.pl ?

mmonroe-ryffine commented 7 years ago

My bad! I merged, committed, and then forgot to push back up. Check it out now.

philiprbrenan commented 7 years ago

Success!