jupiterbroadcasting.com icon indicating copy to clipboard operation
jupiterbroadcasting.com copied to clipboard

Add different versions of `people` files

Open kbondarev opened this issue 3 years ago • 7 comments

Closes #72

Still need to manually merge the people files prefixed with double underscore "__" and make just one file per host/guest.

kbondarev avatar Jul 10 '22 16:07 kbondarev

Safe to merge this to store the work done, then I can get to choosing the correct profiles later?

Wondering if that's the best course of action......

gerbrent avatar Jul 11 '22 23:07 gerbrent

@gerbrent This is how I'd go about this:

  • Checkout this branch, commit your changes to it and push to github.
  • Then will have to resolve any conflicts with the main branch (I could deal with that if you want)
  • Then when all ready, move this PR from draft to ready

In practice it looks like this:

  • Change to the branch
git checkout feature/people-data-conflict
  • Just in case you've been on it before locally, pull so it's all up to date:
git pull
  • Do any work - make whatever commits you want locally and then push them. You will see them appear here in this PR.

Message me on Matrix if you got any questions or need help:)

kbondarev avatar Jul 12 '22 00:07 kbondarev

Oh this is a brilliant way to work on this. new paradigm engaged Thanks @kbondarev !

gerbrent avatar Jul 12 '22 01:07 gerbrent

A lot has happened since this PR was opened.At a minimum it needs rebasing before a merge, but is it still something we want?

ironicbadger avatar Aug 18 '22 12:08 ironicbadger

definitely my fault on the stagnation - i was supposed to take action here.

gerbrent avatar Aug 18 '22 15:08 gerbrent

The people file for me needs to match what I PR'd earlier imho.

ironicbadger avatar Sep 01 '22 21:09 ironicbadger

I am actively working on this today - merging all the duplicate profiles.

gerbrent avatar Sep 02 '22 00:09 gerbrent