Hi Vinayan, On Thu, Feb 21, 2013 at 11:13 PM, vinayan <[email protected]> wrote:
> I also believe a nice workflow should be in the qgis website somewhere. > > We have a brief one here at > http://hub.qgis.org/wiki/17/GIT_Workflow > > Probably someone could update the above page and link it to the developer > help pages.. > > Below mentioned link mentions my workflow..what i observed with this is > that > I no longer need to do a force push.. > http://opengisdev.wordpress.com/2013/02/22/branch-based-workflow-for-qgis/ > On the page you referenced above, step #13 will probably return something like the following: $ git push origin branch-test To [email protected]:dakcarto/Quantum-GIS.git ! [rejected] branch-test -> branch-test (non-fast-forward) error: failed to push some refs to '[email protected]: dakcarto/Quantum-GIS.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Merge the remote changes (e.g. 'git pull') hint: before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. Regardless of whether the feature branch is part of a pull request, if you locally rebased it (from master in this case) and have already pushed it to your github fork, I believe you will always then have to do a force push. Regards, Larry > -- > View this message in context: > http://osgeo-org.1560.n6.nabble.com/contributing-diffs-tp5035623p5036043.html > Sent from the Quantum GIS - Developer mailing list archive at Nabble.com. > _______________________________________________ > Qgis-developer mailing list > [email protected] > http://lists.osgeo.org/mailman/listinfo/qgis-developer >
_______________________________________________ Qgis-developer mailing list [email protected] http://lists.osgeo.org/mailman/listinfo/qgis-developer
