github - Git merge changes between upstream brnches -

-

i bit unsure how can make changes upstream branch. had local copy of branch a, had commits , pushed origin (my fork). want update branch a on original, , later merge changes branch a branch b on upstream.

fyi, have changes on upstream branch a. want write new changes on top of branch b on upstream.

your question not entirely clear me going assume things. assume want merge commits branch a of local repo branch b of upstream repo. assume fork , upstream repos reside on github (because tagged github).

there many ways this, depending on whether have write access on upstream repo. recommended methods merging on shared repo 2nd , 3rd ones (using pull request workflow)

if have write access upstream repo

  1. in local repo, set upstream repo 1 of remote repo, if haven't (you can name whatever want, people name upstream). command is

    git remote add upstream <url/path of upstream repo>

  2. fetch branch b upstream executing (both, in sequence)

    git fetch upstream

    git checkout upstream/b

    or (if have local copy of b)

    git checkout b

    git pull upstream

  3. merge b a

  4. while @ branch b, execute git push upstream b

note merging other people's branch locally , pushing shared remote repo considered bad practice owner of branch may not realize his/her remote branch modified, may result in branch divergence , unnecessary merges.

if don't have write access upstream repo

this method used people regardless of whether have write access upstream repo or not. i.e. people don't push upstream straight away unless under special circumstances, despite having write access.

  1. push branch a origin (your fork)

  2. go upstream repo on github , submit pull request. (note branches pull request from , merge into)

  3. wait owner/collaborator of remote repo accept pull request.

yet alternative

i noticed mentioned have changes on branch on upstream repo. in case can pull request straight away. , if have write access repo, can accept own pull request straight away. again, bad practice on shared repo, if branch b not owned you, or shared branch.

hope helps.


Comments

Post a Comment

Popular posts from this blog

Java 3D LWJGL collision -

-
i making 3d java game lwjgl library, , wondering how add collision detection, player not go through models. i using obj models. here objloader class, loads models: package renderengine; import java.io.bufferedreader; import java.io.file; import java.io.filenotfoundexception; import java.io.filereader; import java.util.arraylist; import java.util.list; import models.rawmodel; import org.lwjgl.util.vector.vector2f; import org.lwjgl.util.vector.vector3f; public class objloader { public static rawmodel loadobjmodel(string filename, loader loader){ filereader fr = null; try { fr = new filereader(new file("res/"+filename+".obj")); } catch (filenotfoundexception e) { system.err.println("couldn't load file!"); e.printstacktrace(); } bufferedreader reader = new bufferedreader(fr); string line; list<vector3f> vertices = new arraylist<vector3f...
Read more

spring - SubProtocolWebSocketHandler - No handlers -

-
i have ugly error during deploying spring app on jboss. 18:11:16,025 error [org.apache.catalina.core.containerbase.[jboss.web].[default-host].[/consumer]] (msc service thread 1-7) exception sending context initialized event listener instance of class org.springframework.web.context.contextloaderlistener: org.springframework.context.applicationcontextexception: failed start bean 'subprotocolwebsockethandler'; nested exception java.lang.illegalargumentexception: no handlers @ org.springframework.context.support.defaultlifecycleprocessor.dostart(defaultlifecycleprocessor.java:176) [spring-context-4.1.3.release.jar:4.1.3.release] @ org.springframework.context.support.defaultlifecycleprocessor.access$200(defaultlifecycleprocessor.java:51) [spring-context-4.1.3.release.jar:4.1.3.release] @ org.springframework.context.support.defaultlifecycleprocessor$lifecyclegroup.start(defaultlifecycleprocessor.java:346) [spring-context-4.1.3.release.jar:4.1.3.release] @ org.s...
Read more

methods - python can't use function in submodule -

-
my folder structure this: pythonstuff/ program.py modulea/ __init__.py foo.py bar.py here's code bar.py : def hello(): print("hello, world!") here's code program.py : #!/usr/bin/env python3 modulea import bar bar.hello() i run $ python3 program.py somehow error: file "program.py", line 3, in <module> bar.hello() attributeerror: 'module' object has no attribute 'hello' edit: __init__.py file empty. edit2: after trying realized had bar.py in root directory contained hello() method. bar.py in modulea/ directory empty. add it import os __all__ = [] module in os.listdir(os.path.dirname(__file__)): if module != '__init__.py' , module[-3:] == '.py': __all__.append(module[:-3]) the init .py files required make python treat directories containing packages; done prevent directories common name, such string, unintentionally hiding v...
Read more