Thanks Viktor -- I'll try that
Simon
On Thu, 7 Apr 2022 at 01:37, Viktor Dukhovni wrote:
> On Wed, Apr 06, 2022 at 10:55:09PM +0100, Simon Peyton Jones wrote:
>
> > I see this
> > bash$ git status
> > On branch wip/romes/ttg-splices-improvements
> > Your branch is up to date with
> 'origin/wip/
On Wed, Apr 06, 2022 at 10:55:09PM +0100, Simon Peyton Jones wrote:
> I see this
> bash$ git status
> On branch wip/romes/ttg-splices-improvements
> Your branch is up to date with 'origin/wip/romes/ttg-splices-improvements'.
>
> modified libraries/Cabal
> +Subproject commit d638e33dbc056048b393
Friends
I see this
bash$ git status
On branch wip/romes/ttg-splices-improvements
Your branch is up to date with 'origin/wip/romes/ttg-splices-improvements'.
Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git restore ..." to discard changes in working
On Wed, 23 Oct 2019, Simon Peyton Jones via ghc-devs wrote:
Aieee! All my GHC repos are failing with this. As a result I can’t pull.
What
should I do? Thanks!
git remote prune origin___
ghc-devs mailing list
ghc-devs@haskell.org
http://mail.h
Thanks everyone!
From: ghc-devs On Behalf Of Bryan Richter
Sent: 23 October 2019 17:36
To: GHC developers
Subject: Re: Urgent: git problem
I suspect a git fetch --prune might help. It looks like git's mapping of remote
branches to a directory tree has caused a conflict between new and
Ah, good to know there's a command *just* for pruning! I'd only ever seen
the --prune flag to fetch/pull.
On Wed, 23 Oct 2019, 18.30 Oliver Charles, wrote:
> I usually encounter this when there has once been a branch called
> "wip/rae" (so .git would have a *file* wip/rae), but now there's a
> b
t;
> *From:* ghc-devs *On Behalf Of *Simon
> Peyton Jones via ghc-devs
> *Sent:* 23 October 2019 17:22
> *To:* ghc-devs
> *Subject:* Urgent: git problem
>
>
>
> Aieee! All my GHC repos are failing with this. As a result I can’t
> pull. What should I do? Thanks!
>
Thanks. Yes 'git remote prune origin' did the trick!
Simon
| -Original Message-
| From: Oliver Charles
| Sent: 23 October 2019 17:30
| To: Simon Peyton Jones
| Cc: ghc-devs
| Subject: Re: Urgent: git problem
|
| I usually encounter this when there has once bee
ia ghc-devs
> *Sent:* 23 October 2019 17:22
> *To:* ghc-devs
> *Subject:* Urgent: git problem
>
>
>
> Aieee! All my GHC repos are failing with this. As a result I can’t
> pull. What should I do? Thanks!
>
> Simon
>
>
>
> git pull
>
> error: canno
I usually encounter this when there has once been a branch called
"wip/rae" (so .git would have a *file* wip/rae), but now there's a
branch called "wip/rae/remove-tc-dep", so "wip/rae" should be a
directory, but it's already in .git as a file! I think "git remote
prune" fixes this, but I can't enti
Hi,
Some googling turned up this SO thread
https://stackoverflow.com/a/43253320/388010
Does that help?
Cheers
Sebastian
Am Mi., 23. Okt. 2019 um 17:22 Uhr schrieb Simon Peyton Jones via ghc-devs <
ghc-devs@haskell.org>:
> Aieee! All my GHC repos are failing with this. As a result I can’t
> p
a completely fresh clone seems ok. but that's a bit brutal
From: ghc-devs On Behalf Of Simon Peyton Jones
via ghc-devs
Sent: 23 October 2019 17:22
To: ghc-devs
Subject: Urgent: git problem
Aieee! All my GHC repos are failing with this. As a result I can't pull.
What s
Aieee! All my GHC repos are failing with this. As a result I can't pull.
What should I do? Thanks!
Simon
git pull
error: cannot lock ref 'refs/remotes/origin/wip/rae/remove-tc-dep':
'refs/remotes/origin/wip/rae' exists; cannot create
'refs/remotes/origin/wip/rae/remove-tc-dep'
>From gi
Thank you – that’s helpful. It’s the mental model that I miss!
Simon
From: Iavor Diatchki [mailto:iavor.diatc...@gmail.com]
Sent: 16 April 2014 16:44
To: Herbert Valerio Riedel
Cc: Simon Peyton Jones; ghc-devs
Subject: Re: Git problem
Hello,
I think the commands Herbert suggested should help
Hello,
I think the commands Herbert suggested should help. I find it useful to
have a mental model of what's going on with git, so here is a brief
explanation, in case it is useful.
The main observation is that Git not only keeps track of the state of all
files in the repo, but also the states o
Hey Simon,
If you have no Haddock changes, try cd'ing into the haddock directory
and doing a hard reset to the remote origin (so something like
git reset --hard origin/master *INSIDE HADDOCK*), and then changing
back to the main directory and git add'ing the directory.
Edward
Excerpts from Simon
On 2014-04-14 at 11:13:02 +0200, Simon Peyton Jones wrote:
[...]
> #both modified: utils/haddock
> The modified files are right. It's the "both modified utils/haddock" that is
> messing me up.
> I'm not modifying haddock! I just want to say "take the master haddock", but
> I don't k
Friends
I'm stuck with Git. Help please!
Simon
I tried to do a 'git stash pop', having just done a 'git pull' from the master
repo. I got this:
simonpj@cam-05-unx:~/code/HEAD-2$ git stash pop
warning: Failed to merge submodule utils/haddock (commits don't follow
merge-base)
Auto-merging util
18 matches
Mail list logo
