Emoji request: :tiphat:
-
@masonwheeler said in Emoji request: :
@asdf OK. To you, what are the two most common, most fundamental operations in source control?
This is going to become a distributed vs. central argument, isn't it? Thanks, I'll pass.
-
@NedFodder said in Emoji request: :
@anotherusername said in Emoji request: :
I don't like . Can we have it be :hat_tip: instead? :hat_tip:
TRWTF would be having both and :hat_tip: with different glyphs.
Yes, that would be worthy. Or should I say worthy?
-
@asdf I think my ideal source control would be a centralized system with git's sensible model of branches and ability to merge, and PRs between branches and master.
-
@anotherusername said in Emoji request: :
@NedFodder said in Emoji request: :
@anotherusername said in Emoji request: :
I don't like . Can we have it be :hat_tip: instead? :hat_tip:
TRWTF would be having both and :hat_tip: with different glyphs.
Yes, that would be worthy. Or should I say worthy?
and worthy.
-
@NedFodder said in Emoji request: :
@anotherusername said in Emoji request: :
@NedFodder said in Emoji request: :
@anotherusername said in Emoji request: :
I don't like . Can we have it be :hat_tip: instead? :hat_tip:
TRWTF would be having both and :hat_tip: with different glyphs.
Yes, that would be worthy. Or should I say worthy?
and worthy.
FTFY.
-
@Yamikuronue That's more-or-less how we use it at my workplace, and it seems to be the intended use within Visual Studio/TFS (but using git instead of TFS's own source control). Our central repo holds the stuff, we checkout and do work locally (typically in feature-ish branches), and when you push a branch the UI guides you to create a PR to merge into master.
-
@hungrier Yup. It's just mildly annoying to have to push when I commit. In SourceTree there's a checkbox to auto-push when you commit, essentially turning git into a centralized system, but I don't see any reason you can't design something that actually is centralized and get the same benefits.
-
@Yamikuronue I do like the ability to break up my work into chunks (local commits) before pushing, but it's effectively just an extra level of branching and merging that doesn't touch the central repo.
-
@Yamikuronue Could
git
be configured with a commit hook that pushes?
-
@hungrier Eh. I usually work on feature branches alone, so it's not like anyone cares. Hooking up branches to upstreams sometimes doesn't work automatically and then I have to fix it, which is annoying af. Ditto the part where sourcetree won't show/fetch branches other people made until I explicitly ask it to.
-
@RaceProUK Yes, but those are per-repo, meaning I'd have to redo it on everything and I'd lose it when I change machines
-
@Yamikuronue Can the hook not be configured on the central repo, and then it's included as part of the clone? I remember I forked SockBot into my own GitHub, tried to commit, and it got rejected because of a commit hook that came preconfigured (the one that forces a format on the commit message).
-
@RaceProUK No, but there's Node packages that set up your hooks for you that Accalia configured to force everyone to have the same hooks on Sockbot.
-
@Yamikuronue Ahh, that explains that
-
@masonwheeler said in Emoji request: :
@Yamikuronue I disagree. If people can't figure out how to make it work, it's not suitable for the function they're trying (and failing) to use it for.
One of the more dramatic illustrations:
blakeyalt detected!
-
@boomzilla Nah. Just an application of the broken-clock principle to our favorite absentee rodent.
-
@masonwheeler said in Emoji request: :
@asdf OK. To you, what are the two most common, most fundamental operations in source control?
What are yours? Questions like this have some assumptions behind them and with different ones we might go to holy war just over the numbers.
-
@boomzilla The two most common operations are known by different names across different VCSs, but I'll simply call them "Push" and "Pull", the operations by which you check changes in to the server and retrieve new code from the server, respectively. I think everyone can agree that these two operations are the most fundamental thing in all of version control, the sine qua non if you will, no?
-
@masonwheeler I dunno, "commit" and "revert" are pretty important.
-
@masonwheeler said in Emoji request: :
I think everyone can agree that these two operations are the most fundamental thing in all of version control, the sine qua non if you will, no?
Well, they seem pretty worthless if the version control can't keep the various versions straight. But yes, input and output are critical.
-
@Yamikuronue Personally, my top two* are fetch, commit, merge, push, pull, and revert.
For a suitably large value of 'two'.
-
@Yamikuronue Commit is another name for Push.
And without Push, there's no point in having a Revert command, as it's basically a way of saying "these are changes I don't want to push."
-
@masonwheeler But for a team size of one, committing is more important than pushing. Which is why the world's most popular VCS is Dropbox
-
@boomzilla said in Emoji request: :
Well, they seem pretty worthless if the version control can't keep the various versions straight.
OK, note: by "operations" I meant "user operations." Keeping versions straight is something you expect the VCS to do, not the person using it.
-
@masonwheeler said in Emoji request: :
@boomzilla said in Emoji request: :
Well, they seem pretty worthless if the version control can't keep the various versions straight.
OK, note: by "operations" I meant "user operations." Keeping versions straight is something you expect the VCS to do, not the person using it.
OK.
-
@masonwheeler said in Emoji request: :
And without Push, there's no point in having a Revert command, as it's basically a way of saying "these are changes I don't want to push."
Wrong.
-
@Yamikuronue said in Emoji request: :
@masonwheeler But for a team size of one, committing is more important than pushing. Which is why the world's most popular VCS is Dropbox
Not really. I use (a real) VCS even for personal projects, because it lets me keep a version history with commit messages. Dropbox doesn't ask me for a commit message when I drop something in there.
-
@masonwheeler Dropbox has 500 million users.
-
@Yamikuronue By "users" do you mean "people who signed up," "people who used it at least once at some point and now have something sitting on Dropbox's servers, whether or not they care about it anymore," or "people who regularly make use of the service"? I would imagine that--like any other online service of non-trivial popularity--there's a pretty wide difference between the three numbers.
-
@masonwheeler said in Emoji request: :
Dropbox doesn't ask me for a commit message when I drop something in there.
E_COMMIT_MESSAGE_NOT_FUNDAMENTAL