latest 10 messages by jgravois
+
[2015-08-17T21:03:07Z]
jgravois
I want to git merge work from master and force any conflicts in favor of work ... Google seems to have a lot about the other way
+
[2015-04-24T01:41:13Z]
jgravois
I am just keeping it local
+
[2015-04-24T01:40:53Z]
jgravois
thanks
+
[2015-04-24T01:15:10Z]
jgravois
A developer told me I need to check out and build a branch in his repo ... so I cloned in to my laptop and now all I have to do is git merge bugFixes (I'm on Master) and then gulp build ... correct?
+
[2015-03-26T22:34:13Z]
jgravois
OK, I'll try that ... thanks
+
[2015-03-26T22:32:39Z]
jgravois
can I still do that?
+
[2015-03-26T21:01:53Z]
jgravois
I have a master repo that contains 4 separate but related applications (https://github.com/RHT-Memphis/theArmProject) and I am trying to deploy one of the apps -- the api for testing. I tried git clone https://github.com/RHT-Memphis/theArmProject/api api and the code for "mobile" was copied to the server. I am flabbergasted!
+
[2015-03-11T15:51:36Z]
jgravois
sorry, that should be in #git
+
[2015-03-11T15:50:44Z]
jgravois
What started as a typo fix has become a major refactor and I don't have a fix branch. Since I don't want to lose this morning's work, is this what I should do: (1) add and commit changes (into master); (2) create the fix branch; (3) checkout the master and reset HARD^ or is there another way?
+
[2015-03-11T09:47:17Z]
jgravois
I have an api and staff, client and mobile sites for a project. They are 4 separate repos but we would like to store them all in one github repo (ie, The ARM Project) ... Is that possible or do we need to make separate Github repos for each?