|
a while ago someone posted this big picture that very simply explained how to translate your svn knowledge/workflow into git, can someone repost it?
|
# ? Jul 26, 2016 16:10 |
|
|
# ? May 23, 2024 04:12 |
|
Verdafolio posted:a while ago someone posted this big picture that very simply explained how to translate your svn knowledge/workflow into git, can someone repost it? git --sever HEAD
|
# ? Jul 26, 2016 16:11 |
|
HoboMan posted:wait there's .net 4.6???
|
# ? Jul 26, 2016 16:11 |
|
Verdafolio posted:a while ago someone posted this big picture that very simply explained how to translate your svn knowledge/workflow into git, can someone repost it?
|
# ? Jul 26, 2016 16:18 |
|
|
# ? Jul 26, 2016 16:19 |
|
This is really a tale of two customers – both reasonably large and successful companies who’ve been using VS for many years. Both had reached out to us with saying they were having problems with sluggishness and stability when dealing with solution files containing 100s of projects and millions of files. One customer, for example, had a solution file with 500 projects (all .NET), which was making VS hang and crash from anywhere within five to 60 minutes of opening a solution. Another customer had a solution file with 200 projects (mostly .NET, but a handful of C++ projects). Though this project would load successfully, it was consuming a lot of CPU cycles, causing the IDE to be very sluggish while editing code, and the customer also experienced random crashes.
|
# ? Jul 26, 2016 16:22 |
|
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
|
# ? Jul 26, 2016 16:22 |
|
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 cargo cult programming. i haven't seen the image you're looking for, but atlassian's tutorials are pretty good and iirc they compare distributed and non-distributed vcs a bit.
|
# ? Jul 26, 2016 16:25 |
|
jony neuemonic posted:cargo cult programming. thx, my university only taught us svn and from what i'm hearing from the new intern, that's still the case.
|
# ? Jul 26, 2016 16:37 |
|
fart simpson posted:nobody uses either and we've gone back to manually doing the task Good job all round gonadic io fucked around with this message at 16:46 on Jul 26, 2016 |
# ? Jul 26, 2016 16:44 |
|
HoboMan posted:This is really a tale of two customers – both reasonably large and successful companies who’ve been using VS for many years. Both had reached out to us with saying they were having problems with sluggishness and stability when dealing with solution files containing 100s of projects and millions of files. One customer, for example, had a solution file with 500 projects (all .NET), which was making VS hang and crash from anywhere within five to 60 minutes of opening a solution. Another customer had a solution file with 200 projects (mostly .NET, but a handful of C++ projects). Though this project would load successfully, it was consuming a lot of CPU cycles, causing the IDE to be very sluggish while editing code, and the customer also experienced random crashes. Okay, 500 projects is p. big, but 200 projects is ~same as my old job and we were terrible.
|
# ? Jul 26, 2016 16:47 |
|
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 as much as git works "fine" for anything, it works "fine" for centralized repos
|
# ? Jul 26, 2016 16:50 |
|
Xarn posted:Okay, 500 projects is p. big, but 200 projects is ~same as my old job and we were terrible. lol we got 5 and are thinking that's too many and maybe we should split them up
|
# ? Jul 26, 2016 16:53 |
|
Captain Foo posted:git --sever HEAD haha I about snorted energy drink all over my keyboard thanks. I needed a good laugh. This week is one of those weeks that makes me question my career choices.
|
# ? Jul 26, 2016 17:27 |
|
Finster Dexter posted:haha I about snorted energy drink all over my keyboard thanks. I needed a good laugh. This week is one of those weeks that makes me question my career choices. same, except every week, and instead of career choices decision to pursue a green card maybe i should go back to the uk.... *brexit* oh.
|
# ? Jul 26, 2016 18:57 |
|
Mr Dog posted:same, except every week, and instead of career choices decision to pursue a green card maybe you should stay in the us... *trump* oh.
|
# ? Jul 26, 2016 19:09 |
|
ok so I shelved a bunch of changes in tfs and now i want to work on them some more but selecting "unshelve" on my shelve set doesn't seem to do anything?
|
# ? Jul 26, 2016 19:45 |
|
HoboMan posted:wait there's a frontpage 2016?
|
# ? Jul 26, 2016 19:56 |
|
help computer
|
# ? Jul 26, 2016 20:17 |
|
i really gotta get in the habit of merging the master into my feature branches more frequently. my merge conflicts are loving intractable
|
# ? Jul 26, 2016 20:18 |
|
GameCube posted:i really gotta get in the habit of merging the master into my feature branches more frequently. my merge conflicts are loving intractable always be rebasing
|
# ? Jul 26, 2016 20:22 |
|
GameCube posted:i really gotta get in the habit of merging the master into my feature branches more frequently. my merge conflicts are loving intractable 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.
|
# ? Jul 26, 2016 20:38 |
|
rebase only if nobody else touches your repository ever
|
# ? Jul 26, 2016 20:50 |
|
woo, this turd finally compiles! happy vs2015 day, me
|
# ? Jul 26, 2016 20:53 |
|
is a project in visual studio analogous to a package?
|
# ? Jul 26, 2016 20:55 |
|
the correct time to rebase is when you have a local/private branch and you want to take all your commits and bring them in front like you made your work right now on a current thing. - you make a local copy of master (or the branch) - you make sure your branch has no remote copy (so no one is depending on it). if you had a branch, 'git checkout -b rebase-branchname' so you have a new one - you select that local branch and go on there - you 'git rebase master' or git rebase localbranchname' - fix all the conflicts if any - you push your branch to the target remote repo as if it were brand new
|
# ? Jul 26, 2016 20:57 |
|
Bloody posted:rebase only if nobody else touches your repository ever if your teams process is sensible, your feature branches should always be safe to rebase. master and other shared branches though? yeah no rebasing. ever.
|
# ? Jul 26, 2016 20:57 |
|
as someone who has never not just committed to master i have no idea what you all are talking about
|
# ? Jul 26, 2016 21:18 |
|
what do yall use in academia/corporate/sm.biz for a git platform tia
|
# ? Jul 26, 2016 21:24 |
graph posted:what do yall use in academia for a git platform I just use git from the command line + github private repositories.
|
|
# ? Jul 26, 2016 21:32 |
|
graph posted:what do yall use in academia/corporate/sm.biz for a git platform our company uses gitlab i use github personally
|
# ? Jul 26, 2016 21:32 |
|
in academia we just used the command line for myjob.biz it's integrated into the IDE if the language you're using don't have an IDE then use a different language
|
# ? Jul 26, 2016 21:32 |
|
help i just keep refactoring my 3d engine code over and over so it makes more sense
|
# ? Jul 26, 2016 21:33 |
|
we use w/e client we want and gitlab
|
# ? Jul 26, 2016 21:35 |
|
If you work at someplace that is heavily invested into the Atlassian ecosystem, there is also hosted bitbucket, but the vanilla bitbucket.org is decent, and offers free private repos.
|
# ? Jul 26, 2016 21:36 |
|
HoboMan posted:in academia we just used the command line sublime text is an ide right?
|
# ? Jul 26, 2016 21:36 |
|
Luigi Thirty posted:help i just keep refactoring my 3d engine code over and over so it makes more sense i don't see the problem here, you've developed a way to make this hobby project last forever
|
# ? Jul 26, 2016 21:37 |
|
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. yeah that
|
# ? Jul 26, 2016 21:41 |
|
academia: command line (as it should be), github, gitlab, bitbucket (old stuff and legacy svn), and a private mirror my last industry job we used some horrible pre-gitlab self-hosted github-like and it was bad bad bad, and still occasionally svn which was worse worse worse but im also old enough to remember all-hands meetings spending hours designing checkout strategies for cvs, and the dude whose job it was to go around and yell at people for not sticking to the plan
|
# ? Jul 26, 2016 21:41 |
|
|
# ? May 23, 2024 04:12 |
|
we use bitbucket but it's an older version so it's still called stash and it sucks
|
# ? Jul 26, 2016 21:42 |