On Wednesday, December 06, 2017 04:56:17 Arun Chandrasekaran via
Digitalmars-d-learn wrote:
> Looks like Mercurial is going to be rewritten in Rust
> https://www.mercurial-scm.org/wiki/OxidationPlan
>
> So Facebook don't use D?
As I understand it, the main languages at Facebook are C++ and PHP,
On Monday, 4 December 2017 at 01:26:45 UTC, Arun Chandrasekaran
wrote:
On Sunday, 3 December 2017 at 23:39:49 UTC, Basile B. wrote:
[...]
If you still lose changes, you could try using Mercurial with
hggit. It can be a bit slow, but not destructive as git itself.
;)
I really wish
On Mon, Dec 04, 2017 at 12:02:37PM -0800, Ali Çehreli via Digitalmars-d-learn
wrote:
[...]
> Paraphrasing someone I trust very much, "Never 'pull', always 'fetch
> -p' and then rebase."
I always use `git pull --ff-only`. Lets me pull when it's "safe",
aborts if it will end up in a mess (i.e.,
On Mon, Dec 04, 2017 at 06:51:42AM -0500, Nick Sabalausky (Abscissa) via
Digitalmars-d-learn wrote:
> On 12/03/2017 03:05 PM, bitwise wrote:
> > I've finally started learning git, due to our team expanding beyond
> > one person - awesome, right?
>
> PROTIP: Version control systems (no matter
On Sunday, 3 December 2017 at 20:05:47 UTC, bitwise wrote:
{snip} If anyone can offer any kind of advice, or an article
that explains these things concisely and effectively, that
would be helpful.
I found some git-specific info in this wiki page:
On 12/4/17 3:14 PM, Ali Çehreli wrote:
Dear git experts, given 3 repos, now what are the steps? Is the
following correct? What are the exact commands?
Disclaimer: I'm not a git expert.
- Only once, create the original repo as an upstream of your local repo.
The wording is off
I'm going to answer with something that others may not agree
with, maybe they can enlighten me, but let me first get a generic
principle of git and answer some questions.
Git has 2 types of branches, local branches (you know them as
just branches) and remotes (which have their own local
On Monday, 4 December 2017 at 20:14:15 UTC, Ali Çehreli wrote:
6) 'git push -force' so that your GitHub repo is up-to-date
right? (There, I mentioned "force". :) )
The right option name is --force-with-lease ).
On Monday, December 04, 2017 12:02:37 Ali Çehreli via Digitalmars-d-learn
wrote:
> On 12/04/2017 09:38 AM, Patrick Schluter wrote:
> > So, avoid pull, look first what fetch does and if that is what you
> > thought it would do, do the merge and be happy.
>
> +1
>
> Paraphrasing someone I trust
On 12/04/2017 12:14 PM, Ali Çehreli wrote:
2) Rebase origin/master (on upstream, right?)
2.5) Create a branch and do all work on that branch
3) Make changes
Ali
On 12/03/2017 12:05 PM, bitwise wrote:
> I've finally started learning git
git is one of those things where as soon as you understand how it works,
you lose the ability to teach. :) I'm watching this thread with
amusement because like most online tutorials, nobody is mentioning the
On 12/04/2017 09:38 AM, Patrick Schluter wrote:
> So, avoid pull, look first what fetch does and if that is what you
> thought it would do, do the merge and be happy.
+1
Paraphrasing someone I trust very much, "Never 'pull', always 'fetch -p'
and then rebase."
Ali
On Monday, 4 December 2017 at 11:51:42 UTC, Nick Sabalausky
(Abscissa) wrote:
On 12/03/2017 03:05 PM, bitwise wrote:
One thing to keep in mind: Any time you're talking about moving
anything from one repo to another, there's exactly two basic
primitives there: push and pull. Both of them are
On Sunday, 3 December 2017 at 20:05:47 UTC, bitwise wrote:
I've finally started learning git, due to our team expanding
beyond one person - awesome, right? Anyways, I've got things
more or less figured out, which is nice, because being clueless
about git is a big blocker for me trying to do
On 12/3/17 3:48 PM, Basile B. wrote:
On Sunday, 3 December 2017 at 20:05:47 UTC, bitwise wrote:
or just some specific files? and do I need a separate branch for each
pull request,
Yes, yes yes, again. ~master is sacrosanct.
For good reason. If you commit things to your master, and they
On Sunday, 3 December 2017 at 20:05:47 UTC, bitwise wrote:
How does one keep their fork up to date? For example, if I fork
https://help.github.com/articles/syncing-a-fork/
On Monday, 4 December 2017 at 04:45:01 UTC, Patrick Schluter
wrote:
On Monday, 4 December 2017 at 01:54:57 UTC, ketmar wrote:
Basile B. wrote:
On Sunday, 3 December 2017 at 22:22:47 UTC, Arun
Chandrasekaran wrote:
Git CLI is arcane and esoteric. I've lost my commits before
(yeah, my
On 12/03/2017 03:05 PM, bitwise wrote:
I've finally started learning git, due to our team expanding beyond one
person - awesome, right?
PROTIP: Version control systems (no matter whether you use git,
subversion, or whatever), are VERY helpful on single-person projects,
too! Highly
On Monday, 4 December 2017 at 01:54:57 UTC, ketmar wrote:
Basile B. wrote:
On Sunday, 3 December 2017 at 22:22:47 UTC, Arun
Chandrasekaran wrote:
Git CLI is arcane and esoteric. I've lost my commits before
(yeah, my mistake).
Who hasn't ;)
me.
Happened to me last time because i tried a
Basile B. wrote:
On Sunday, 3 December 2017 at 22:22:47 UTC, Arun Chandrasekaran wrote:
Git CLI is arcane and esoteric. I've lost my commits before (yeah, my
mistake).
Who hasn't ;)
me.
Happened to me last time because i tried a command supposed to remove
untracked files in
On Sunday, 3 December 2017 at 23:39:49 UTC, Basile B. wrote:
On Sunday, 3 December 2017 at 22:22:47 UTC, Arun Chandrasekaran
wrote:
Git CLI is arcane and esoteric. I've lost my commits before
(yeah, my mistake).
Who hasn't ;)
Happened to me last time because i tried a command supposed to
On Sunday, 3 December 2017 at 22:22:47 UTC, Arun Chandrasekaran
wrote:
Git CLI is arcane and esoteric. I've lost my commits before
(yeah, my mistake).
Who hasn't ;)
Happened to me last time because i tried a command supposed to
remove untracked files in submodules...but used "reset" in a
Git CLI is arcane and esoteric. I've lost my commits before
(yeah, my mistake). Since then I always access git via mercurial.
In comparison Mercurial is far better a VCS tool.
On Sunday, 3 December 2017 at 20:05:47 UTC, bitwise wrote:
I've finally started learning git, due to our team expanding
beyond one person - awesome, right? Anyways, I've got things
more or less figured out, which is nice, because being clueless
about git is a big blocker for me trying to do
On Sunday, 3 December 2017 at 20:05:47 UTC, bitwise wrote:
I've finally started learning git, due to our team expanding
beyond one person - awesome, right? Anyways, I've got things
more or less figured out, which is nice, because being clueless
about git is a big blocker for me trying to do
I've finally started learning git, due to our team expanding
beyond one person - awesome, right? Anyways, I've got things more
or less figured out, which is nice, because being clueless about
git is a big blocker for me trying to do any real work on
dmd/phobos/druntime. As far as working on a
26 matches
Mail list logo
