Github - merging fork into master (locally) -


so have following problem: when started programming, forked repository (using github windows) browser-game. time now, made stuff, did git commit , issued pull request using webpage. original author did authorize pull request , changes went live. recently, have become "official" author on original repository.

so dont want work on "fork" longer instead dev on original. using github windows, decided "clone" original repo. github shows forked (ancientsion/fieryvoid) repository , original (aatu/fieryvoid).

now somehow "merge" forked repo local clone of original repo , there commit master repo directly, way deploying local, not yet commited changes fork live version while @ same time getting rid of fork repository.

however, have no idea if works , if does, how. can please advise ?

i don't think github windows interface supports this, can done via git bash console. untested, steps ought correct, since i've done similar (identical, in fact) before. assumes clone, ancientsion/fieryvoid, up-to-date aatu/fieryvoid, can done pull followed merge, or, avoid merge commits, git pull --rebase. have ancientsion/fieryvoid , aatu/fieryvoid, both present locally, ancientsion/fieryvoid ahead of aatu/fieryvoid few commits. need pull in commits aatu/fieryvoid running following:

cd  path/to/local/clone/of/aatu/fieryvoid git remote add local_pull path/to/local/clone/of/ancientsion/fieryvoid git pull local_pull master git push origin master

couple of assumptions:

  1. you working on master branch of ancientsion/fieryvoid. if not, replace master in line 3 branch name.
  2. origin remote tracks online repo aatu/fieryvoid

Comments

Post a Comment

Popular posts from this blog

jquery - How do you format the date used in the popover widget title of FullCalendar? -

Image
in fullcalendar, how format date used in popover widget title when clicking '+n more'? code: <div class="fc-popover fc-more-popover"> <div class="fc-header fc-widget-header"> <span class="fc-close fc-icon fc-icon-x"></span> <span class="fc-title">tuesday, april 7</span> ... </div> ... </div> you use daypopoverformat that. determines date format of title of popover created eventlimitclick option. must date formatting string. default value "dddd, mmmm d" english , "ll" other languages.
Read more

Bubble Sort Manually a Linked List in Java -

Image
this first question here. trying manually sort linked list of integers in java , can not figure out wrong code. suggestions? don't error, still have output unordered. tried few different ways, nothing worked. appreciate if can me that. public class node { int data; node nextnode; public node(int data) { this.data = data; this.nextnode = null; } public int getdata() { return this.data; } } // node class public class datalinkedlist implements datainterface { private node head; private int size; public datalinkedlist(){ this.head = null; this.size = 0; } public void add(int data) { node node = new node(data); if (head == null) { head = node; } else { node currentnode = head; while(currentnode.nextnode != null) { currentnode = currentnode.nextnode; } currentnode.nextnode = node; ...
Read more

asp.net mvc - SSO between MVCForum and Umbraco7 -

i need integrate sso between mvcforum (forum of company) , umbraco7 (manages cms company). however struggling shared authentication work. tried several ways suggested on other threads still not running expected. here did: 1. in mvcforum (forum.mywebsite.com) 1.1. machine key in web.xml: <machinekey validationkey="the same key umbraco7" decryptionkey="the same key umbraco7" validation="sha1" decryption="aes" /> 1.2. authenticate forms in web.xml <forms name="my-sso-auth" protection="all" path="/" timeout="43200" domain="forum.mywebsite.com" loginurl="/members/logon" enablecrossappredirects="true" /> 2. in umbraco7 (news.mywebsite.com) 2.1. machine key in web.xml: <machinekey validationkey="the same key mvcforum" decryptionkey="the same key mvcforum" validation="sha1" decryption="aes" /> 2.2. a...
Read more