Note that there are some explanatory texts on larger screens.

plurals
  1. POHow do I continue development once my pull has been applied, without using the pull request
    primarykey
    data
    text
    <p>I'm having troubles phrasing this clearly, but I'll give it a shot.</p> <h2>Situation:</h2> <ul> <li>I <a href="https://github.com/ryantheleach/MChat" rel="nofollow">forked</a> a <a href="https://github.com/MiracleM4n/MChat" rel="nofollow">Repository</a> as my master then cloned it locally.</li> <li>Made my changes, and sent a <a href="https://github.com/MiracleM4n/MChat/commit/6967d4c78e7bd164739c1c3f5b2afd534a3fe372" rel="nofollow">pull request</a>.</li> <li>The pull request has been closed, and has been <a href="https://github.com/MiracleM4n/MChat/commit/6967d4c78e7bd164739c1c3f5b2afd534a3fe372" rel="nofollow">"added manually"</a> (patch and apply).</li> </ul> <h2>Question:</h2> <ul> <li>How do I get my local (and <a href="https://github.com/ryantheleach/MChat" rel="nofollow">remote</a>) repository back in sync with the <a href="https://github.com/MiracleM4n/MChat" rel="nofollow">upstream project</a>?</li> </ul> <hr> <ul> <li>I don't care about keeping minor differences.</li> <li>I want my code to be easily pulled in the future.</li> <li>I don't want to lose history (mine or upstreams).</li> <li>Will the solution cause me issues with developing in the future?</li> </ul> <h2>Alternatives:</h2> <ul> <li>is there an easier way?</li> <li>Should I just rename this branch (somehow) and start afresh?</li> <li><ul> <li>(somehow) sync the rename locally and work from a new master? </li> </ul></li> <li><ul> <li>Should I now forget using branches named master as this will cause me issues?</li> </ul></li> </ul> <h2>Github's in question:</h2> <ul> <li><a href="https://github.com/MiracleM4n/MChat/commit/6967d4c78e7bd164739c1c3f5b2afd534a3fe372" rel="nofollow">Original Upstream "pull"</a></li> <li><a href="https://github.com/ryantheleach/MChat" rel="nofollow">My Repository</a></li> </ul>
    singulars
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload