We said rebase for the time being, to work more like SVN, if we'd like to change that at some point in the future, we will.
On Sat, Feb 23, 2013 at 2:52 PM, Daniel Juyung Seo <[email protected]>wrote: > Yes 'git pull --rebase' also helps but we should decide the policy first. > There was a discussion about this but as far as I know we didn't make > a conclusion that can be announced. > > Daniel Juyung Seo (SeoZ) > > On Sat, Feb 23, 2013 at 11:46 PM, Bluezery <[email protected]> wrote: > > Before make commit, git pull should be done to prevent this useless > commit. > > If conflict occurred, git stash & git pull & git stash pop is good > solution. > > Otherwise, solve the conflict manually to make commit on top of the > > origin/master's HEAD. > > > > 2013/2/23 Daniel Juyung Seo <[email protected]>: > >> Hello, this must be the first "merge branch" commit. > >> So what's our policy? "merge" or "rebase"? > >> I think we didn't clear this up. > >> > >> Daniel Juyung Seo (SeoZ) > >> > >> On Sat, Feb 23, 2013 at 7:52 PM, ChunEon Park - Enlightenment Git > >> <[email protected]> wrote: > >>> hermet pushed a commit to branch master. > >>> > >>> commit 029d539a85306019608e27a611ace500b313dd71 > >>> Merge: 9c950e4 161a784 > >>> Author: ChunEon Park <[email protected]> > >>> Date: Sat Feb 23 19:52:57 2013 +0900 > >>> > >>> Merge branch 'master' of ssh://git.enlightenment.org/core/efl > >>> > >>> src/examples/ecore/ecore_imf_example.c | 44 > +++++++++++++++++++++++++++------- > >>> 1 file changed, 36 insertions(+), 8 deletions(-) > >>> > >>> -- > >>> > >>> > ------------------------------------------------------------------------------ > >>> Everyone hates slow websites. So do we. > >>> Make your web apps faster with AppDynamics > >>> Download AppDynamics Lite for free today: > >>> http://p.sf.net/sfu/appdyn_d2d_feb > >> > >> > ------------------------------------------------------------------------------ > >> Everyone hates slow websites. So do we. > >> Make your web apps faster with AppDynamics > >> Download AppDynamics Lite for free today: > >> http://p.sf.net/sfu/appdyn_d2d_feb > >> _______________________________________________ > >> enlightenment-devel mailing list > >> [email protected] > >> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > > > > > -- > > BRs, > > Kim. > > > > > ------------------------------------------------------------------------------ > > Everyone hates slow websites. So do we. > > Make your web apps faster with AppDynamics > > Download AppDynamics Lite for free today: > > http://p.sf.net/sfu/appdyn_d2d_feb > > _______________________________________________ > > enlightenment-devel mailing list > > [email protected] > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > ------------------------------------------------------------------------------ > Everyone hates slow websites. So do we. > Make your web apps faster with AppDynamics > Download AppDynamics Lite for free today: > http://p.sf.net/sfu/appdyn_d2d_feb > _______________________________________________ > enlightenment-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > -- Tom. ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
