On Fri, 7 May 2021, 8:13 am Ethan Furman, wrote:
> On 5/6/21 7:14 AM, Jelle Zijlstra wrote:
>
> > Maybe others have different workflows, but I don't see much of a need
> > for keeping your fork's main branch up to date.
>
> I will occasionally do a `git push origin main` just to shut up the
>
Just today, GitHub launched a new feature to sync a branch with upstream
via the web UI.
https://github.blog/changelog/2021-05-06-sync-an-out-of-date-branch-of-a-fork-from-the-web
On Thu., May 6, 2021, 15:16 Ethan Furman, wrote:
> On 5/6/21 7:14 AM, Jelle Zijlstra wrote:
>
> > Maybe others
On 5/6/21 7:14 AM, Jelle Zijlstra wrote:
> Maybe others have different workflows, but I don't see much of a need
> for keeping your fork's main branch up to date.
I will occasionally do a `git push origin main` just to shut up the messages about being behind/ahead; other than that,
I have no
> Maybe others have different workflows, but I don't see much of a need for
> keeping your fork's main branch up to date. My workflow is something like
> this:
>
> % git remote -v
> origin g...@github.com:JelleZijlstra/cpython.git (fetch)
> origin g...@github.com:JelleZijlstra/cpython.git (push)
I also don't keep my fork in sync, and never needed to.
I use the same workflow as Jelle.
On Thu., May 6, 2021, 7:18 a.m. Jelle Zijlstra,
wrote:
>
>
> El jue, 6 may 2021 a las 6:58, Skip Montanaro ()
> escribió:
>
>> > Your main branch in GitHub has some commits they are not in
>>
El jue, 6 may 2021 a las 6:58, Skip Montanaro ()
escribió:
> > Your main branch in GitHub has some commits they are not in
> python/cpython.
> > https://github.com/smontanaro/cpython/commits/main
>
> Regarding this. How else am I to keep my fork in sync with
> python/cpython other than by the
> Your main branch in GitHub has some commits they are not in python/cpython.
> https://github.com/smontanaro/cpython/commits/main
Regarding this. How else am I to keep my fork in sync with
python/cpython other than by the occasional pull upstream/push origin
process? That's what all those merges
Thanks for the recipe to fix my problem.
Your main branch in GitHub has some commits they are not in python/cpython.
> https://github.com/smontanaro/cpython/commits/main
Is there a way to easily tell how they differ? My (obvious to me, but
wrong) guess was
git diff upstream/main origin/main
On Thu, May 6, 2021 at 2:46 PM Skip Montanaro wrote:
>
> I looked at the fast-forward stuff in 'git push --help' but couldn't
> decipher what it told me, or more importantly, how it related to my
> problem. It's not clear to me how python/cpython:main can be behind
> smontanaro/cpython:main.
Your main branch in GitHub has some commits they are not in python/cpython.
https://github.com/smontanaro/cpython/commits/main
If you don't mind to trash all changes in your local and Github main
branch, you can sync main branches by:
# delete all changes in your worktree and main branch.
$ git
10 matches
Mail list logo
