|
|
#
?
Jan 13, 2017 16:20
|
|
|
|
| # ? Jun 8, 2024 23:14 |
|
|
Sapozhnik posted:lol if you don't shuffle the commits in your topic branches like a deck of cards on the reg and selectively deliver some of them to master as and when the need arises
|
|
#
?
Jan 13, 2017 16:23
|
|
|
you are like child watch this 
|
|
#
?
Jan 13, 2017 16:31
|
|
|
carry on then posted:you are like child 
|
|
#
?
Jan 13, 2017 16:31
|
|
|
carry on then posted:you are like child what subway system is this a map of
|
|
#
?
Jan 13, 2017 16:43
|
|
|
Bloody posted:what subway system is this a map of the enterprise java metro. lmao.
|
|
#
?
Jan 13, 2017 16:49
|
|
|
 
|
|
#
?
Jan 13, 2017 17:45
|
|
|
i don't understand how git or version control works lol
|
|
#
?
Jan 13, 2017 18:38
|
|
|
just push
|
|
#
?
Jan 13, 2017 19:42
|
|
|
hmm. how do you make those pretty diagrams.
|
|
#
?
Jan 13, 2017 19:48
|
|
|
i open sourcetree
|
|
#
?
Jan 13, 2017 20:21
|
|
|
first i work on like four branches at once because juggling and multitasking is very inefficient, then i finish them all at once and merge them to master
|
|
#
?
Jan 13, 2017 20:22
|
|
|
carry on then posted:you are like child gitflow loving sucks
|
|
#
?
Jan 13, 2017 20:29
|
|
|
i guess i cheated a little because that's more than one person but all you have to do is make the rule that one change no matter how small is a new branch and presto
|
|
#
?
Jan 13, 2017 20:30
|
|
|
lol if your git isn't a straight line
|
|
#
?
Jan 13, 2017 20:30
|
|
|
wow our git looks so much nicer than that. everything we merge has to get rebased first... and now i understand why.
|
|
#
?
Jan 13, 2017 20:31
|
|
|
akadajet posted:lol if your git isn't a straight line yeah that's basically how mine has looked, i'm the only one on my team that actually writes code anyways. i started using branches this week tho.
|
|
#
?
Jan 13, 2017 20:36
|
|
|
every new feature must be in a new branch located exactly 16 QPUs from master
|
|
#
?
Jan 13, 2017 21:12
|
|
|
BONGHITZ posted:just push pretty much
|
|
#
?
Jan 14, 2017 09:27
|
|
|
if the commits are hosed up its the next guys problem hth
|
|
#
?
Jan 14, 2017 09:27
|
|
|
akadajet posted:lol if your git isn't a straight line  it's good poo poo
|
|
#
?
Jan 14, 2017 09:55
|
|
|
I just push to master
|
|
#
?
Jan 14, 2017 16:37
|
|
|
current project has a team of 8 developers all pushing straight to master 
|
|
#
?
Jan 14, 2017 17:21
|
|
|
Rex-Goliath posted:current project has a team of 8 developers all pushing straight to master I too use svn
|
|
#
?
Jan 14, 2017 17:42
|
|
|
we may as well be but no we're using git
|
|
#
?
Jan 14, 2017 17:57
|
|
|
Rex-Goliath posted:current project has a team of 8 developers all pushing straight to master Yeah this is one of those things I can't really get upset about after using SVN for so many years... 8 devs isn't that large a team, its small enough that you can all hopefully coordinate and ensure you're not touching the same files at the same time. I hate git but I like github... at least theres tons of stack overflow posts about it so when I have to do something weird I can usually google "how to do thing in git" and find something to c/p into my commandline (like I do for the rest of my job)
|
|
#
?
Jan 14, 2017 18:08
|
|
|
Rex-Goliath posted:we may as well be but no we're using git I used to work with a guy that thought using branches wasn't "agile" since we couldn't run the entire integration test suite for every single commit. So we were using git like SVN for awhile basically.
|
|
#
?
Jan 14, 2017 18:09
|
|
|
Rex-Goliath posted:current project has a team of 8 developers all pushing straight to master basically this but instead it's "integration" that only gets promoted to master if the cd continuous build is green also it's 80 instead of 8
|
|
#
?
Jan 14, 2017 18:45
|
|
|
when your git is a mess but you can't pipe thru less that's our bloody
|
|
#
?
Jan 14, 2017 20:03
|
|
|
ADINSX posted:Yeah this is one of those things I can't really get upset about after using SVN for so many years... 8 devs isn't that large a team, its small enough that you can all hopefully coordinate and ensure you're not touching the same files at the same time. it's not the crosswiring that's frustrating it's them breaking the build on an hourly basis and forcing me to hunt them down to fix it or fixing it myself
|
|
#
?
Jan 14, 2017 20:06
|
|
|
Rex-Goliath posted:current project has a team of 8 developers all pushing straight to master same but five devs, but they only just escaped ten+ years of ClearCase thanks to me so I cut them some serious slack
|
|
#
?
Jan 14, 2017 20:26
|
|
|
what's wrong with git flow
|
|
#
?
Jan 14, 2017 20:36
|
|
|
where i work has the dumbest poo poo. you work on a branch, and then push it to dev -> test -> stage -> prod branches and your commits just pick up a load of random detritus on the way
|
|
#
?
Jan 15, 2017 01:24
|
|
|
pram posted:where i work has the dumbest poo poo. you work on a branch, and then push it to dev -> test -> stage -> prod branches and your commits just pick up a load of random detritus on the way don't sign
|
|
#
?
Jan 15, 2017 01:26
|
|
|
i keep a kerbalscript thing in my github partly because it has no idea what it is and that's funny to me somehow
|
|
#
?
Jan 15, 2017 03:45
|
|
|
git is a mess
|
|
#
?
Jan 15, 2017 03:58
|
|
|
fritz posted:when gently caress yes
|
|
#
?
Jan 15, 2017 04:16
|
|
|
fritz posted:when
|
|
#
?
Jan 15, 2017 21:04
|
|
|
fritz posted:when
|
|
#
?
Jan 16, 2017 01:01
|
|
|
|
| # ? Jun 8, 2024 23:14 |
|
|
git flow is good. also lol graphical git client
|
|
#
?
Jan 16, 2017 06:22
|
|
