Loomio

Github/Obsidian Experiment

RH Ronen Hirsch Public Seen by 7

A container for discussing the unfolding of the proposal from @Josh Fairhead to transition from CollectiveOne to version-controlled Github/Obsidian in order to facilitate flowing collaboration.

RH

Ronen Hirsch Sat 27 Nov 2021 7:46PM

@Josh Fairhead I've been watching some tutorials on the Github vocabulary ... and I think I found some clarity around what is missing for us to really use branching well.

The issue I have is how can I view a branch IN OBSIDIAN without committing it? It is one thing to view a change made to one or two files ... but if there is a collection of changes (for example made to a generative sequence: edits to some transformations, change to the sequence itself, new transformation added, transformation removed) ... which have accumulated on a branch ... how can I view the aggregated outcome IN OBSIDIAN and THEN decide if I want to merge it to the main (or other) branch?

It seems to me like I am looking for a "temporary" or "simulated" commit ... and I don't know how to manifest this.

Maybe there is an answer to this in an extended vocabulary of operations that are possible on GitKraken?

Is my question clear?

JF

Josh Fairhead Sat 27 Nov 2021 9:38PM

Yes I think I understand what your asking for. A quick revision, followed by your answer:

Branching / Stashing

Basic branching as described the other day on Discord normally goes `git checkout branchName` before doing stuff in Obsidian followed by a commit. When you switch back to the main branch (`git checkout main`) the things you just added will disappear from Obsidian. You can demo that with the branch I just put on there if you like.

To do this in GitKraken, you can just use the tab on the top left to change branch. This also assumes a commit.

Managing changes on a branch without commits:

To change branches without committing your edits you can stash them. Stashing is a somewhat broad topic and my experience with it was getting confused because I came back to a clean branch... Then I learned about this subsystem: https://git-scm.com/docs/git-stash - I still don't understand it but from the sounds of your description, its probably the resource your looking for Ronen.

JF

Josh Fairhead Mon 29 Nov 2021 7:46PM

So just trying to get Jennifer set up with @Ronen Hirschs Css a min ago I failed to get things working and I'm still not sure why. I followed the instructions for myself and Alex last week and everything went fine. This week, not so.

I created a new folder in the .obsidian/ directory making the path `Generativeprocess/.obsidian/snippets` and created a new file `echo text > obsidian.css` I then opened this file and pasted Ronens CSS before saving it again. Going back to obsidian it sees the file in the appearance settings. When enabled it turns off the scroll bars, but alas the headers do not disappear. Any clues?

TB

Toni Blanco Mon 29 Nov 2021 8:35PM

Have you checked the file permissions?

RH

Ronen Hirsch Tue 30 Nov 2021 9:16AM

From your description, it sounds like one (or more) of the CSS rules is not parsing properly.

I would check if the obsidian.css files for something missing or something excessive. The thing that stands out to me is that when you created the file using an echo command that the files was created with the string "text" in it ... did you remove/overwrite that?

Alternatively, @Jennifer Damashek I am attaching here the CSS file that is working for me so that you can download it and replace the one that you have that may have an error in it.

JF

Josh Fairhead Tue 30 Nov 2021 3:51PM

Nope, I know very little about how these work on PC.

JF

Josh Fairhead Tue 30 Nov 2021 3:50PM

That was pretty much my conclusion, but I don't read css particularly well. I didn't try sending my exact file, but we did try copying the css that was working for me. I've learnt about the file types windows creates before and I know the `echo > text` builds a particular flavour of file (encoding), but the method worked fine for @Alex Rodriguez when we set up his machine so I'm assuming the file type is ok - especially as part of the file is parsing.

@Jennifer Damashek, perhaps try replacing your file (`Generativeprocess/.obsidian/snippets/obsidan.css`) with the one @Ronen Hirsch shared above and let us know if anything changes (remember to go to settings>appearence and toggle the css off and on again before restarting Obsidian)

JD

Jennifer Damashek Tue 30 Nov 2021 6:56PM

I replaced the file with the one Ronen shared and nothing changed, and I did remember to go to settings and follow the instructions. Let me know if you have any other ideas. On the weekend Robert will have a look.