These are chat archives for alariva/timegridDevelopment

10th
Nov 2016
Ariel Vallese
@alariva
Nov 10 2016 12:11
Hi @swbittib, were you able to setup the business as per your -client- needs?
Calvin Roger S. Canas
@calvincanas
Nov 10 2016 12:58
pushed but can't see my commit
Ariel Vallese
@alariva
Nov 10 2016 12:59
You have to push the branch
So it would be git push origin branchname
Replace branchname for the actual one
Calvin Roger S. Canas
@calvincanas
Nov 10 2016 13:02
Ok
done
Ariel Vallese
@alariva
Nov 10 2016 13:04
Well done, now your branch is on github, on your fork
I will check the commit
It looks good
So now you can create your PR from github
Against the official repo on master
Calvin Roger S. Canas
@calvincanas
Nov 10 2016 13:07
even with the behind commits on my repo agains the official?
Ariel Vallese
@alariva
Nov 10 2016 13:08
let me see
Screenshot from 2016-11-10 10:09:12.png
maybe you are behind on master
but your issue branch is up-to-date, on top of the upstream master
so its ok
you will have to pull on your local master as well to update your commits behind
so, go ahead, create the PR
Calvin Roger S. Canas
@calvincanas
Nov 10 2016 13:11
for now I will create the PR?
Ariel Vallese
@alariva
Nov 10 2016 13:12
you can create the PR now, yes
Calvin Roger S. Canas
@calvincanas
Nov 10 2016 13:13
scrutinizer is like travis-ci?
timegridio/timegrid#109
Ariel Vallese
@alariva
Nov 10 2016 13:13
similar, but another service
so now, the tests will run
and check your change...
yes, you already did that, but just to make sure that they pass and you did not forget... that is Continuous Integration (CI)
A few hints about commits:
The first line should be a short description (72 chars max). yours is perfect
then you can skip one line and then write a brief paragraph explaining your approach
like "This change will replace empty names and lastnames with an #n/d so they become clickable. See discussion on issue."
Ariel Vallese
@alariva
Nov 10 2016 13:18
That'd be like a very good practice, not always easy to follow, but here you have a nice article on commit messages: http://chris.beams.io/posts/git-commit/
Ariel Vallese
@alariva
Nov 10 2016 13:24
Screenshot from 2016-11-10 10:24:39.png
So while build is in progress I can pull your changes and try them in my local
I did this:
git remote add calvin https://github.com/calvincanas/timegrid
git pull calvin issue/108-contacts-without-name
Calvin Roger S. Canas
@calvincanas
Nov 10 2016 13:26
I see. just like adding the official remote :)
Ariel Vallese
@alariva
Nov 10 2016 13:26
git checkout issue/108-contacts-without-name
php artisan serve
Calvin Roger S. Canas
@calvincanas
Nov 10 2016 13:26
Ok, you did in on your own local copy?
Ariel Vallese
@alariva
Nov 10 2016 13:26
yes
Calvin Roger S. Canas
@calvincanas
Nov 10 2016 13:26
I see that is why a branch when issue or feature is being made?
Ariel Vallese
@alariva
Nov 10 2016 13:26
so I can see it working apart from tests
yes
imagine many developers working on the same branch and different problems
Calvin Roger S. Canas
@calvincanas
Nov 10 2016 13:27
I see
Ariel Vallese
@alariva
Nov 10 2016 13:27
would be messy and prone to collisions (merge conflicts)
this way we reduce merge conflicts as much as possible
so now that I checked your fix
I can return back to my master git checkout master
and delete the temp branch (we will merge it from the PR)
git branch -D issue/108-contacts-without-name
You can se phpunit in action here:
Calvin Roger S. Canas
@calvincanas
Nov 10 2016 13:31
yes. this is great
so much to learn
Ariel Vallese
@alariva
Nov 10 2016 13:36
So, see now that the build has passed
Now I can merge it into the master branch
Calvin Roger S. Canas
@calvincanas
Nov 10 2016 13:39
hmm mm
Ariel Vallese
@alariva
Nov 10 2016 13:41
So, now it's merged
and you can see that I added a description to the merge
and that the issue was automatically closed
Plus, a way to say thanks
Calvin Roger S. Canas
@calvincanas
Nov 10 2016 13:51
hahaha
will do more
a lot of issues are still open
Ariel Vallese
@alariva
Nov 10 2016 13:51
hahaha
most of them are big ones
but I'll open more for small-change-big-improve
Calvin Roger S. Canas
@calvincanas
Nov 10 2016 13:52
hahahaha. Will still try now should I go back to master branch?
and push the master to my repo?
Ariel Vallese
@alariva
Nov 10 2016 13:52
yes
so you should do like this:
git checkout master
git pull upstream master
git push origin master
Feel free to spot your own bugs and enhancements as well
Ariel Vallese
@alariva
Nov 10 2016 15:40
@calvincanas , I pushed a slight enhancement to your change :)
for reusability
timegridio/timegrid@49b6547