Post 9gOgOJOXEigKwm1UBc by moonman@pleroma.cucked.me
 (DIR) More posts by moonman@pleroma.cucked.me
 (DIR) Post #9gOfq3kkswPcac5Ew4 by moonman@pleroma.cucked.me
       2019-03-03T14:42:26.883590Z
       
       0 likes, 0 repeats
       
       Sorry folks, migration hasn't even started yet because I'm struggling to just git merge develop into my branch.
       
 (DIR) Post #9gOg2uMt5bsrFO2vsu by shpufeff@social.ufeff.club
       2019-03-03T14:44:54.520073Z
       
       0 likes, 0 repeats
       
       @moonman did you do it like:git checkout developgit pullgit checkout mybranchgit merge develop
       
 (DIR) Post #9gOg9yifJHYWllbVdg by hj@shigusegubu.club
       2019-03-03T14:46:13.368897Z
       
       0 likes, 0 repeats
       
       @shpufeff @moonman i usually do it like this:git checkout mybranchgit fetchgit merge origin/develop
       
 (DIR) Post #9gOgOJOXEigKwm1UBc by moonman@pleroma.cucked.me
       2019-03-03T14:48:38.420207Z
       
       0 likes, 0 repeats
       
       @shpufeff says up to date. I have my own repo, I think I need to fetch upstream or something.
       
 (DIR) Post #9gOgR9M913LUgKG3tY by shpufeff@social.ufeff.club
       2019-03-03T14:49:18.068613Z
       
       0 likes, 0 repeats
       
       @moonman oh yeah, that makes it a bit more tricky, yeah you do need to do that
       
 (DIR) Post #9gOhSSKQ3z8FladbdI by moonman@pleroma.cucked.me
       2019-03-03T15:00:34.908776Z
       
       1 likes, 0 repeats
       
       @shpufeff Figured it out.