[Expo-tech] Git setup /gitkraken

[Philip Sargent (Gmail)]

Ah brilliant. I'll try it. Thanks.
Probably won't make it to the pub this evening. Histon is a long way from me and I have lots to do.

-----Original Message-----
From: Expo-tech [mailto:expo-tech-bounces at lists.wookware.org] On Behalf Of Sam Wenham
Sent: 02 July 2019 18:25
To: expo-tech at lists.wookware.org
Subject: Re: [Expo-tech] Git setup /gitkraken

I have fixed this by changing the config on the server to

git config --local receive.denyCurrentBranch updateInstead

This causes git to checkout the current branch rather than object to
your push.

We now must not make changes on the server and leave them not checked
in. Actually I would go for don't make changes on the server at all.

We could have a copy of the repo that is bare that is for the repo
serving and another copy that is for the web server that has master
checked out. Now we are using git we should make more use of branches
for changes and merges to apply the change to master.

If you do leave uncommitted changes kicking around on the server you
will get this

To ssh://expo.survex.com/~/troggle
 ! [remote rejected] master -> master (Working directory has unstaged
changes)

Sam

On 02/07/2019 00:25, Philip Sargent (Gmail) wrote:
> No, I have hit a brick wall.
> I can't get gitkraken to do anything other than pull, and I can't work
> out how to make it clone cavedrawings/ either.
> It does pull troggle/ though.
> I'll have to bring it to the pub tomorrow evening (is there WiFi at the
> ElmTree?) and get a git expert to help me through it.
> 
> On Mon, 1 Jul 2019 at 23:58, Philip Sargent (Gmail)
> <philip.sargent at gmail.com <mailto:philip.sargent at gmail.com>> wrote:
> 
>     I am now having some success using gitkraken (free version, GUI for
>     git working on xubuntu/xfce)  [Search domain www.gitkraken.com]
>     <https://duckduckgo.com/?q=gitkraken+site:www.gitkraken.com&t=canonical&atb=v129-1>https://www.gitkraken.com
> 
>     <https://www.gitkraken.com/>
> 
>     which has a nice visual display of the merge tree
>     <https://www.gitkraken.com/> but it does require this form of the url:
> 
>     ssh://expo@expo.survex.com/home/expo/troggle
>     <mailto:ssh://expo@expo.survex.com/home/expo/troggle>
> 
>     not the form with the /~/
> 
>     As a beginner git user, I am struggling. I can pull but not push (a
>     minor text change to README.txt) as "the branch is checked out"
> 
> 
>     On 28/06/2019 18:49, Wookey wrote:
>>     On 2019-06-28 16:17 +0100, Sam Wenham wrote:
>>>     I had a chat with our master of git. To clone from the server via ssh
>>>     you need to do
>>>
>>>     git clone ssh://expo@expo.survex.com/~/troggle <mailto:ssh://expo@expo.survex.com/~/troggle>
>>     Aha. obviously. I wonder why I've never come across that before. 
>>     Similarly:
>>     git clone ssh://expo@expo.survex.com/home/expo/troggle <mailto:ssh://expo@expo.survex.com/home/expo/troggle>
>>     works
>>
>>
>>     Wookey
>>
>>     _______________________________________________
>>     Expo-tech mailing list
>>     Expo-tech at lists.wookware.org <mailto:Expo-tech at lists.wookware.org>
>>     https://lists.wookware.org/cgi-bin/mailman/listinfo/expo-tech
> 
> 
> _______________________________________________
> Expo-tech mailing list
> Expo-tech at lists.wookware.org
> https://lists.wookware.org/cgi-bin/mailman/listinfo/expo-tech
> 

_______________________________________________
Expo-tech mailing list
Expo-tech at lists.wookware.org
https://lists.wookware.org/cgi-bin/mailman/listinfo/expo-tech