I think you did - 'git push origin master' the first time -hence the [rejected] master -> master (non-fast-forward)
Since the remote master was ahead of your local master the updates were rejected. Technically you should never use -f flag cause it does a force rewrite. Interesting point to make is about the upstream branch. git fetch upstream git merge upstream/master The above does the same thing as git pull upstream master (the fetch happens underneath the pull command). Cheers~ On Mon, Mar 31, 2014 at 8:38 PM, Nirmal Fernando <[email protected]> wrote: > Cool.. then :-) > > > On Mon, Mar 31, 2014 at 8:36 PM, Afkham Azeez <[email protected]> wrote: > >> >> >> >> On Mon, Mar 31, 2014 at 8:33 PM, Nirmal Fernando <[email protected]> wrote: >> >>> Hi Azeez, >>> >>> But that would have over-written some code in the remote, that has been >>> committed after the revision you have in your local repo. >>> >> >> I am the only one working on that feature branch, so I don't think anyone >> has committed any changes there. Probably I did something stupid. >> >> >>> >>> >>> On Mon, Mar 31, 2014 at 8:17 PM, Afkham Azeez <[email protected]> wrote: >>> >>>> git push -f worked >>>> >>>> >>>> On Mon, Mar 31, 2014 at 8:07 PM, Afkham Azeez <[email protected]> wrote: >>>> >>>>> >>>>> On Mon, Mar 31, 2014 at 8:04 PM, Sameera Jayasoma <[email protected]>wrote: >>>>> >>>>>> git pull origin >>>>> >>>>> >>>>> git pull origin cluster-coordinator-feature didn't make a difference >>>>> >>>>> >>>>> -- >>>>> *Afkham Azeez* >>>>> Director of Architecture; WSO2, Inc.; http://wso2.com >>>>> Member; Apache Software Foundation; http://www.apache.org/ >>>>> * <http://www.apache.org/>* >>>>> *email: **[email protected]* <[email protected]> >>>>> * cell: +94 77 3320919 <%2B94%2077%203320919> blog: * >>>>> *http://blog.afkham.org* <http://blog.afkham.org> >>>>> *twitter: >>>>> **http://twitter.com/afkham_azeez*<http://twitter.com/afkham_azeez> >>>>> * linked-in: **http://lk.linkedin.com/in/afkhamazeez >>>>> <http://lk.linkedin.com/in/afkhamazeez>* >>>>> >>>>> *Lean . Enterprise . Middleware* >>>>> >>>> >>>> >>>> >>>> -- >>>> *Afkham Azeez* >>>> Director of Architecture; WSO2, Inc.; http://wso2.com >>>> Member; Apache Software Foundation; http://www.apache.org/ >>>> * <http://www.apache.org/>* >>>> *email: **[email protected]* <[email protected]> >>>> * cell: +94 77 3320919 <%2B94%2077%203320919> blog: * >>>> *http://blog.afkham.org* <http://blog.afkham.org> >>>> *twitter: >>>> **http://twitter.com/afkham_azeez*<http://twitter.com/afkham_azeez> >>>> * linked-in: **http://lk.linkedin.com/in/afkhamazeez >>>> <http://lk.linkedin.com/in/afkhamazeez>* >>>> >>>> *Lean . Enterprise . Middleware* >>>> >>>> _______________________________________________ >>>> Dev mailing list >>>> [email protected] >>>> http://wso2.org/cgi-bin/mailman/listinfo/dev >>>> >>>> >>> >>> >>> -- >>> >>> Thanks & regards, >>> Nirmal >>> >>> Senior Software Engineer- Platform Technologies Team, WSO2 Inc. >>> Mobile: +94715779733 >>> Blog: http://nirmalfdo.blogspot.com/ >>> >>> >>> >> >> >> -- >> *Afkham Azeez* >> Director of Architecture; WSO2, Inc.; http://wso2.com >> Member; Apache Software Foundation; http://www.apache.org/ >> * <http://www.apache.org/>* >> *email: **[email protected]* <[email protected]> >> * cell: +94 77 3320919 <%2B94%2077%203320919> blog: * >> *http://blog.afkham.org* <http://blog.afkham.org> >> *twitter: **http://twitter.com/afkham_azeez*<http://twitter.com/afkham_azeez> >> * linked-in: **http://lk.linkedin.com/in/afkhamazeez >> <http://lk.linkedin.com/in/afkhamazeez>* >> >> *Lean . Enterprise . Middleware* >> > > > > -- > > Thanks & regards, > Nirmal > > Senior Software Engineer- Platform Technologies Team, WSO2 Inc. > Mobile: +94715779733 > Blog: http://nirmalfdo.blogspot.com/ > > > > _______________________________________________ > Dev mailing list > [email protected] > http://wso2.org/cgi-bin/mailman/listinfo/dev > > -- Chan (Dulitha Wijewantha) Software Engineer - Mobile Development WSO2Mobile Lean.Enterprise.Mobileware * ~Email [email protected] <[email protected]>* * ~Mobile +94712112165* * ~Website dulitha.me <http://dulitha.me>* * ~Twitter @dulitharw <https://twitter.com/dulitharw>* *~SO @chan <http://stackoverflow.com/users/813471/chan>*
_______________________________________________ Dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/dev
