git - How to skip "Hit return to start merge resolution tool" and open mergetool automatically -

-

git asking hit return button open mergetool each conflict file 1 one:

> git mergetool  normal merge conflict '...':   {local}: modified file   {remote}: modified file hit return start merge resolution tool (opendiff):

how can avoid hitting return step project , open configured merge tool automatically?

use -y flag. documentation:

-y
--no-prompt
don’t prompt before each invocation of merge resolution program.


Comments

Post a Comment

Popular posts from this blog

Line ending issue with Mercurial or Visual Studio -

-
i seem have strange issue caused either visual studio or mercurial. localised single project, i'm guessing in project configuration causing issue. at difficult specify point, when perform action in visual studio, update every line ending in given file, means when @ file in sourcetree, every line has changed. i can replicate using nuget add package dependency; packages.config entirely replaced. if commit changes, including line endings, later same issue occur. workaround have shelve changes , reapply them, whereupon lines written correctly. i'm not sure application blame here. did make mistake of allowing sourcetree change mercurial configuration, issue have fixed, i'm not sure if has persisted. i thought might issue mercurial.ini files or hgrcs don't seem contain untoward. here's mercurial.ini [ui] username = .... [auth] bb.prefix = https://bitbucket.org/ bb.username = .... bb.password = .... [extensions] mq = rebase = [web] allow_push = * push_s...
Read more

python - Received unregistered task using Celery with Django -

-
i have celery setup django project , can't seem task run properly. i'm using django 1.4.3, celery 3.0.1, django-celery 3.0.17 , python 2.7 on ubuntu 13.04. i have verified rabbitmq-server running: sudo service rabbitmq-server status status of node rabbit@fenster ... [{pid,1667}, {running_applications,[{rabbit,"rabbitmq","3.0.2"}, {os_mon,"cpo cxc 138 46","2.2.9"}, {mnesia,"mnesia cxc 138 12","4.7"}, {sasl,"sasl cxc 138 11","2.2.1"}, {stdlib,"erts cxc 138 10","1.18.1"}, {kernel,"erts cxc 138 10","2.15.1"}]}, {os,{unix,linux}}, {erlang_version,"erlang r15b01 (erts-5.9.1) [source] [64-bit] [smp:8:8] [async-threads:30] [kernel-poll:true]\n"}, {memory,[{total,28112760}, {connection_procs,93432}, {que...
Read more

php - Retrieving data submitted with Yii's CActiveForm -

-
i trying retrieve data form created using widget cactiveform. however, when click on submit button, no data written targeted url. how obtain submitted form data? <p>please list ages of members of household:</p> <div class="form offset3"> <?php $form = $this->beginwidget('cactiveform', array( 'id' => 'survey', 'enableclientvalidation' => true, 'enableajaxvalidation' => true, 'action'=>yii::app()->createurl('//survey_resp'), 'clientoptions' => array( 'validateonsubmit' => true, ), 'htmloptions' => array( 'class' => 'form-horizontal', ), )); ?> <div class="row"> <?php echo $form->labelex($model, 'age_1'); ?> <?php echo $form->textfield($model, 'age_1'); ?> ...
Read more