|
|
|
|
|
- GIT assistance
-
Started by
Peter Bennet
-
22/09/2021 at 16:56
-
Sorry Peter that’s my fault.
I didn’t realise you’d done anything after you g...
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- GIT assistance
-
Started by
Peter Bennet
-
22/09/2021 at 16:56
-
[quote=Peter Bennet;post=141653]I was just trying to get my copies up to date wi...
|
|
|
|
- GIT assistance
-
Started by
Peter Bennet
-
22/09/2021 at 16:56
-
I was just trying to get my copies up to date with Stephen's changes.
I've done...
|
|
|
|
- GIT assistance
-
Started by
Peter Bennet
-
22/09/2021 at 16:56
-
The last commit available on the server is by Fulcher so any changes you've made...
|
|
|
|
- GIT assistance
-
Started by
Peter Bennet
-
22/09/2021 at 16:56
-
Turned into an awful mess so went for the nuclear option and copied the files fr...
|
|
|
|
- GIT assistance
-
Started by
Peter Bennet
-
22/09/2021 at 16:56
-
[quote=clive;post=141645]It looks like 2.0 was based on 1.2 rather than 1.3. So ...
|
|
|
|
- GIT assistance
-
Started by
Peter Bennet
-
22/09/2021 at 16:56
-
Generally with 3 way merges you just work through each "hunk" (block of change) ...
|
|
|
|
- GIT assistance
-
Started by
Peter Bennet
-
22/09/2021 at 16:56
-
Thanks, I see.
Now it reports that there are conflicts.
They are reasonably ...
|
|
|
|
- All RAIU Reports
-
Started by
Gwasanaethau
-
19/09/2013 at 17:56
-
The RAIU have published [b]Overhead Line detachment, Pearse Station, 1st October...
|
|
|
|
- GIT assistance
-
Started by
Peter Bennet
-
22/09/2021 at 16:56
-
It looks like 2.0 was based on 1.2 rather than 1.3. So when you pull it you may ...
|
|
|
|
- GIT assistance
-
Started by
Peter Bennet
-
22/09/2021 at 16:56
-
Yes just pull the latest commit. You'll probably then find the tree straightens ...
|
|
|
|
- GIT assistance
-
Started by
Peter Bennet
-
22/09/2021 at 16:56
-
Stephen's uploaded some tweaks to GIT and I'm now presented with this display.
...
|
|
|
|
|
|
|
|
- Plymouth
-
Started by
Stephen Fulcher
-
21/09/2021 at 21:36
-
There is a new version of Plymouth in the Testing Records section.
This prima...
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|