• Open Menu Close Menu
  • Apple
  • Shopping Bag
  • Apple
  • Mac
  • iPad
  • iPhone
  • Watch
  • TV
  • Music
  • Support
  • Search apple.com
  • Shopping Bag

Lists

Open Menu Close Menu
  • Terms and Conditions
  • Lists hosted on this site
  • Email the Postmaster
  • Tips for posting to public mailing lists
Re: Your branch is ahead of 'origin/master' by 1 commit.
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Your branch is ahead of 'origin/master' by 1 commit.


  • Subject: Re: Your branch is ahead of 'origin/master' by 1 commit.
  • From: Jerry Krinock <email@hidden>
  • Date: Thu, 12 Sep 2013 16:50:52 -0700

On 2013 Sep 12, at 12:32, Jens Alfke <email@hidden> wrote:

> You sure this wasn’t when you pushed? Commit is a purely local operation and shouldn’t be affected by anything that happened on Github.

Probably you are correct, Jens.  Maybe I was doing "Commit" with the "Push" checkbox switched on.

> Well, neither ‘ahead’ nor ‘behind’ really applies; they’re just _different_.

So git is a little too presumptuous with its choice of words.

> Each of them has a new different commit at its head. By default ‘git push’ won’t create a new head on a destination repo, so it gives you an error instead. Then you do what you did — pull the remote change, merge if necessary, and then push.
>
> (A tip: Use “git pull --rebase”. It’ll end up with a linear history with the remote changes coming first and then your new un-pushed ones. A regular pull will use a merge, which makes the history look branchy and harder to follow.)

I shall study that.  I had been wondering if it's still OK to use the GitHub app or the command line interface since I started using Source Control in Xcode.  But it seems that lots of people do this, and I conclude that it's OK because they use the same local git data, provided that they not be allowed to do git operations simultaneously.


 _______________________________________________
Do not post admin requests to the list. They will be ignored.
Xcode-users mailing list      (email@hidden)
Help/Unsubscribe/Update your Subscription:

This email sent to email@hidden


  • Follow-Ups:
    • Re: Your branch is ahead of 'origin/master' by 1 commit.
      • From: Jens Alfke <email@hidden>
References: 
 >Your branch is ahead of 'origin/master' by 1 commit. (From: Jerry Krinock <email@hidden>)
 >Re: Your branch is ahead of 'origin/master' by 1 commit. (From: Jens Alfke <email@hidden>)

  • Prev by Date: Re: Your branch is ahead of 'origin/master' by 1 commit.
  • Next by Date: Re: Your branch is ahead of 'origin/master' by 1 commit.
  • Previous by thread: Re: Your branch is ahead of 'origin/master' by 1 commit.
  • Next by thread: Re: Your branch is ahead of 'origin/master' by 1 commit.
  • Index(es):
    • Date
    • Thread