|
github and lightweight feature branches + pull requests
|
# ? Jul 26, 2016 21:52 |
|
|
# ? May 25, 2024 13:15 |
|
academia: dropbox real job: we moved from self hosted mercurial to bitbucket (still using mercurial tho), people use mainly tortoisehg and a bunch of scripts some dude put together to work on the main repo cuz it has subrepos and is awful
|
# ? Jul 26, 2016 23:16 |
|
if it makes you feel any better subrepos suck just as hard in git as they do in hg subrepos are just a bad idea ok
|
# ? Jul 27, 2016 01:32 |
|
Verdafolio posted:the CTO gave me a very interesting death stare when i asked if we could use mercurial or why we even bother with a distributed versioning system if no more than one person usually works on anything at one time mercurial is just bikeshedding
|
# ? Jul 27, 2016 02:19 |
|
git could use some bikeshedding
|
# ? Jul 27, 2016 02:36 |
|
its not bike shedding if you're building a bike shed
|
# ? Jul 27, 2016 02:40 |
|
i spun up a t2.nano and put a regular bare git repo on there that's accessed over ssh. i have one coworker and i make about 80% of the commits. an issue tracker would be nice but eh, this works in the meantime. i'm gonna try gogs on something that doesn't matter as much and if that doesn't turn into a ball of flames then i might install that at work. (speaking of matter and much, mattermost is a cool self hosted slack clone and yall should check it out)
|
# ? Jul 27, 2016 02:49 |
|
hobbesmaster posted:its not bike shedding if you're building a bike shed actually, that's extremely bike shedding
|
# ? Jul 27, 2016 02:58 |
|
Mr Dog posted:i spun up a t2.nano and put a regular bare git repo on there that's accessed over ssh. i have one coworker and i make about 80% of the commits. just use bitbucket and you get private repos for free
|
# ? Jul 27, 2016 03:07 |
|
gitlab is also fine too
|
# ? Jul 27, 2016 03:11 |
|
Valeyard posted:you can write a flask-restful python app thats like 15 lines long that acts as a proxy, so instead of hitting site.com/whatever/ you hit locahost:5000/whatever/ mystes fucked around with this message at 04:26 on Jul 27, 2016 |
# ? Jul 27, 2016 04:24 |
|
Mr Dog posted:i spun up a t2.nano and put a regular bare git repo on there that's accessed over ssh. i have one coworker and i make about 80% of the commits. if its just a bare repo use like a shared folder lool
|
# ? Jul 27, 2016 04:29 |
|
comedyblissoption posted:git is better than svn even if you're a single developer who works on a private repository no one else will ever work on mercurial has no features to recommend it that git lacks. it just has a nicer ui. a much nicer ui. it should say everything that git's primary components are the "plumbing" and the "porcelain." git's own authors analogize it to a toilet. for gently caress's sake.
|
# ? Jul 27, 2016 06:28 |
|
i recognize that git won this war and i converted all my personal repos from hg to git long ago but that doesn't mean i gotta be happy about it
|
# ? Jul 27, 2016 06:29 |
|
Mr Dog posted:i spun up a t2.nano and put a regular bare git repo on there that's accessed over ssh. i have one coworker and i make about 80% of the commits. bitbucket is 100% free including private repos and poo poo for <5 users
|
# ? Jul 27, 2016 06:30 |
|
I liked git better before I became aware that there's a thing called phabricator that people use with it.
|
# ? Jul 27, 2016 06:45 |
|
jony neuemonic posted:rebase instead of merge imo but yes, it's a critical habit otherwise you're going to screw up a merge to master sooner or later. b-b-but everyone told me that branching and merging in git was fine!
|
# ? Jul 27, 2016 12:35 |
|
it is fine.
|
# ? Jul 27, 2016 12:39 |
|
~Coxy posted:b-b-but everyone told me that branching and merging in git was fine! It is. If you never rebase then you'll never screw up master by simply branching and merging. However, you'll have a knotty history polluted with lots of useless bullshit. If you've got a really long running feature branch then branching and merging master might make sense because then you've genuinely got two long-running concurrent streams of development and you should probably make the history reflect that. Also manually fixing up a rebase on top of a conflicting change is far more difficult and risky (in the sense that you might lose a shitton of work and not even realize) than just thrashing everything out in a merge commit at the end of it all.
|
# ? Jul 27, 2016 12:41 |
|
GameCube posted:we use bitbucket but it's an older version so it's still called stash and it sucks after the name change it continues to suck
|
# ? Jul 27, 2016 12:43 |
|
the only bad thing i can really think about git from an end user perspective is a terrible CLI with some horrible inconsistencies. the logical interface is fine. if that is the only bad thing about git we are blessed javascript on the other hand...
|
# ? Jul 27, 2016 12:49 |
|
git sucks at binary files i guess
|
# ? Jul 27, 2016 12:54 |
|
just spent 2 days refactoring a bunch of code. introduced a some regressions. caught by unit tests I wrote. feels good man.
|
# ? Jul 27, 2016 12:55 |
|
i like refactoring it gives me a good feeling but then i get the sinking feeling that the industry keeps creating these towering edifices of rube goldberg machines that feels constantly under entropy and that im only chipping away at it barely with my refactoring and it's going to crush under its own weight like a black hole into an unmaintainable morass anyways
|
# ? Jul 27, 2016 13:01 |
|
Mr Dog posted:make the history lol
|
# ? Jul 27, 2016 13:19 |
|
now im constantly getting this error: code:
|
# ? Jul 27, 2016 14:44 |
|
now the source control on my project is unrecognized gently caress
|
# ? Jul 27, 2016 15:17 |
|
thanks, everyone who replied
|
# ? Jul 27, 2016 15:21 |
|
~Coxy posted:b-b-but everyone told me that branching and merging in git was fine! pretty much just echoing mr dog and fart simpson at this point but: it is fine. git can't stop you from eventually hitting merge conflicts as soon as two or more developers are involved, and better to solve them in your own feature branch instead of potentially hosing master.
|
# ? Jul 27, 2016 16:01 |
|
C# code:
|
# ? Jul 27, 2016 16:58 |
|
I found descent's source code online and it looks like I'm doing things sorta right go me
|
# ? Jul 27, 2016 17:00 |
|
Making and reconciling development histories is the entire purpose of Git and tools like it. It stands to reason that you want this history to be constructed in a manner that maximizes its utility for merging or retrospection, and like any tool that depends on your competence using it (as well as how well the tool's design lends itself to being used competently, which is admittedly an area where Git leaves something to be desired).
|
# ? Jul 27, 2016 17:05 |
|
Luigi Thirty posted:I found descent's source code online and it looks like I'm doing things sorta right go me at least the old school way before graphics cards had hardware to do everything (this is a good thing)
|
# ? Jul 27, 2016 17:07 |
|
is there a way i can quickly see all the global variables declared in a javascript? this latest upgrade made them all not work anymore and i don't want to visually scan every single loving file in my entire solution for globals so i can take them out
|
# ? Jul 27, 2016 17:20 |
|
run the statement "window" in the browser console.
|
# ? Jul 27, 2016 17:25 |
|
fart simpson posted:actually, that's extremely bike shedding we are still shedding, but on a higher level and about more important bikes
|
# ? Jul 27, 2016 18:31 |
|
Strumpy posted:just spent 2 days refactoring a bunch of code. introduced a some regressions. caught by unit tests I wrote. feels good man. You did refactoring correctly
|
# ? Jul 27, 2016 18:49 |
|
so in visual studio with the entity designer, is there any difference between and just creating a direct many to many mapping?
|
# ? Jul 27, 2016 19:25 |
|
hobbesmaster posted:at least the old school way before graphics cards had hardware to do everything i'm studying old games turns out mechwarrior 2's object models were just broken down into individual pieces that were attached to each other which allowed the fancy explosions and limbs being blown off and stuff
|
# ? Jul 27, 2016 19:35 |
|
|
# ? May 25, 2024 13:15 |
|
BiohazrD posted:so in visual studio with the entity designer, is there any difference between 2nd normal form?
|
# ? Jul 27, 2016 20:38 |