Welcome to Doom9's Forum, THE in-place to be for everyone interested in DVD conversion.

Before you start posting please read the forum rules. By posting to this forum you agree to abide by the rules.

 

Go Back   Doom9's Forum > Programming and Hacking > Development

Reply
 
Thread Tools Search this Thread Display Modes
Old 17th September 2020, 12:19   #1  |  Link
FranceBB
Broadcast Encoder
 
FranceBB's Avatar
 
Join Date: Nov 2013
Location: Royal Borough of Kensington & Chelsea, UK
Posts: 2,883
Merging changes from upstream master (GitHub)

Hi there,
even though I'm an encoder, namely a broadcast engineer, I studied Computer Science Engineering and I do work on some projects as developer as the company asked me to do it in the past. Since pretty much everything I've done is made by myself only, I would rather not lose them if the company kicks me out one day, so I forked it to my personal GitHub account.
As I make changes, I generally get a message on my fork saying that it's "x" commits behind, so I compare it with the master (which I updated myself) and I merge changes to my fork.
Easy peasy.
So I thought: since I rely on Avisynth all the time and I use it as well in some of the automatization programs I made to make my life easier, wouldn't it be bad to fork it and keep it stored and upated in a "safe place" like my Company's GitHub so that if something terribly bad happens to Ferenc, I would still have a safe working copy? So I forked it from https://github.com/AviSynth/AviSynthPlus however, I can't see changes and merge them to my local fork. Why?
FranceBB is offline   Reply With Quote
Old 17th September 2020, 12:46   #2  |  Link
ChaosKing
Registered User
 
Join Date: Dec 2005
Location: Germany
Posts: 1,795
Do you see the typical "forked from AviSynth/AviSynthPlus" text under you repo title/name on github?
__________________
AVSRepoGUI // VSRepoGUI - Package Manager for AviSynth // VapourSynth
VapourSynth Portable FATPACK || VapourSynth Database

Last edited by ChaosKing; 17th September 2020 at 12:49.
ChaosKing is offline   Reply With Quote
Old 17th September 2020, 13:44   #3  |  Link
FranceBB
Broadcast Encoder
 
FranceBB's Avatar
 
Join Date: Nov 2013
Location: Royal Borough of Kensington & Chelsea, UK
Posts: 2,883
For Avisynth? Not really, no: https://i.imgur.com/cxHQi53.png
However I do see it for other repositories I work on: https://i.imgur.com/AXIuBOe.png
FranceBB is offline   Reply With Quote
Old 17th September 2020, 13:48   #4  |  Link
ChaosKing
Registered User
 
Join Date: Dec 2005
Location: Germany
Posts: 1,795
This is why you don't get the x commits behind message. It think this called "git upstream" where you can set up a repo as a parent repo or something like that.
If you click on the fork button on github it sets it up automatically for you.
__________________
AVSRepoGUI // VSRepoGUI - Package Manager for AviSynth // VapourSynth
VapourSynth Portable FATPACK || VapourSynth Database
ChaosKing is offline   Reply With Quote
Reply

Thread Tools Search this Thread
Search this Thread:

Advanced Search
Display Modes

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is On
HTML code is Off

Forum Jump


All times are GMT +1. The time now is 06:22.


Powered by vBulletin® Version 3.8.11
Copyright ©2000 - 2024, vBulletin Solutions Inc.