make sure to continually pull down from dev
I just pulled your master to my master and I'm going to work out of the dev now.
I was 60 commits behind
Actually I'm going to create a new branch for myself.
Well no not actually
I'll just work out of dev. Sticking with the plan.
the .gitignore file is being weird. Won't let me add .DS Store to the ignore
so you are going to work out of the dev in your fork correct?
github is showing your dev branch as being 58 commits behind my dev
u might want to even that up
both of your branches are behind as well Chareesa..just a heads up before you start anything
hrmm
I did the pull of your master. I haven't done anything yet other than trying to update the git ignore to not track the DS_Store
take a look at this ignore list provided by git hub https://gist.github.com/octocat/9257657
yah thats a good list
really the big ones for us are going to be log files, node_modules/, DS_Store Thumbs.db potentially..
So my master is even with your master, but my dev is behind your dev
tried to do a remote pull request on your dev, but it gave me an error message.
yah basically thats where u run into issues
if you made edits
before doing a pull on the main dev..
you are going to have merge conflicts
Maybe I should just restart before I write any code. Delete my fork, delete my local content. Rebuild from scratch.
sure that works
and before you ever write any code..
do a pull request
and during the week..before you add anything or commit anything
do a pull request
Essentially start my day with a pull request
and throughout the day
just to make the conflicts a minimum
there will most likely be conflicts, it justs keeps that low if u do it multiple times during the day while we are all writing line after line of code ;)
I'll read that now. Github is taking a shit for some reason.
sure is taking a shit
ha
I deleted my forked repo of concierge and accidentally deleted github
hah!
git is back up. I updated the .gitignore. Kept the stuff you had in there and added that gist. We'll prune it if there are any serious merge conflicts.
I have the fork. Isn't there a way to track a remote git/
?
what do you mean
I think you can setup a git branch to track changes in a branch you forked from
I think what you are referring to is called an upstream
yes
so you can watch the upstream/pull from it
I think I need to set that up now
honestly, I havent messed around with that
Then I just pull from your master to my forked master for now?
not sure without looking at your code
did you kind of reset
delete your fork
or are you trying to just merge on top of what u have
I deleted my previous concierge fork. I then created a new fork of your repo. I'm completely caught up on my master and dev branch.
So going forward I do remote pull requests from your master?
well, you probably wont be doing any work in master..
agreed
this is kind of how I see it going..
first read about upstream
so sync your fork
git fetch upstream
then git merge upstream/dev
that should sync up without losing local changes
so do all of your work in dev, sync with the upstream dev frequently. Push to your origin dev when you have changed you want to commit..
and when you are ready to throw those to me..do a pull request from your dev to mine
I will try and keep you guys updated
when the main dev is updated.
when something is merged with master, that means its stable
if we get the chance tomorrow we should do the sync together to make sure we're all on the same page.
i will definitely give you guys a heads up when that happens so you can sync your master
yah, I think we straighten out git workflow tomorrow morning first
this will make sure we are all on the same page.
if we can work in git we are going to waste a lot of time
ok. bare bones testing framework for users and concierges has been started.
good stuff
testing is going to be SUPER important
There are a couple of empty spaces as I figure out the program. We have tokens and confirmation numbers
Could you make a third test file for jobs and calls?
We're going to need it in the master anyways so I figure you could create it and I'll pull it down and fill it up
yah, we are going to have to get into some mocks I think at some point..
I will make something in a bit..submitting all of the assignments due tomorrow before I forget
Cool. So basically there's a test for every get and post in your users routes and concierge routes
I'm going to call it for the night, but tomorrow after we talk I can start to write some tests for routes that don't exist yet or other items if neccessary.
Not tonight, but I need to get a better understanding of how the confirmation numbers are going to work. Some of the tests are going to be looking for jwt and others for that confirm #
ok, lets talk in the morning then
thanks!