Re: [pt-br-dev] duvida sobre git

Segui as dicas mas o problema continua, será que estou fazendo pull de
forma errada ?

anderson@anderson:~/libo$ git status
# On branch meulibre
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   dictionaries (new commits)
#       modified:   helpcontent2 (new commits)
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       .directory
#       Makefile.in
#       boost/boost.7774.warnings.patch.1
#       chart2/source/inc/defines.hxx
#       config/
#       connectivity/inc/pch/
#       cui/uiconfig/ui/spellingdialog.ui
#       dbaccess/inc/pch/
#       extensions/source/ole/wincrap.hxx
#       external/CustomTarget_jawt.mk
#       external/CustomTarget_mingw_dlls.mk
#       external/CustomTarget_wine.mk
#       external/Makefile
#       external/Module_external.mk
#       external/Package_dbghelp.mk
#       external/Package_jawt.mk
#       external/Package_mingw_dlls.mk
#       external/Package_msms.mk
#       external/Package_msvc_dlls.mk
#       external/Package_wine.mk
#       external/StaticLibrary_gnu_getopt.mk
#       external/StaticLibrary_gnu_readdir_r.mk
#       external/UnpackedTarball_glibc.mk
#       external/glibc/config.h
#       external/glibc/glibc-2.1.3.patch
#       external/glibc/readdir_r.c
#       graphite/graphite2.issue1115.patch.1
#       icon-themes/tango_testing/cmd/lc_arrowshapes.chevron.png
#       icon-themes/tango_testing/cmd/lc_arrowshapes.chevron.svg
#       icon-themes/tango_testing/cmd/lc_arrowshapes.down-arrow.png
#       icon-themes/tango_testing/cmd/lc_arrowshapes.down-arrow.svg
#       icon-themes/tango_testing/cmd/lc_arrowshapes.left-arrow.png
#       icon-themes/tango_testing/cmd/lc_arrowshapes.left-arrow.svg
#       icon-themes/tango_testing/cmd/lc_arrowshapes.right-arrow.png
#       icon-themes/tango_testing/cmd/lc_arrowshapes.right-arrow.svg
#       icon-themes/tango_testing/cmd/lc_arrowshapes.up-arrow.png
#       icon-themes/tango_testing/cmd/lc_arrowshapes.up-arrow.svg
#       icon-themes/tango_testing/cmd/lc_basicshapes.can.png
#       icon-themes/tango_testing/cmd/lc_basicshapes.can.svg
#       
icon-themes/tango_testing/cmd/lc_basicshapes.circle_lc_flowchartshapes.flowchart-connector_lc_circle.svg
#       icon-themes/tango_testing/cmd/lc_basicshapes.cross.png
#       icon-themes/tango_testing/cmd/lc_basicshapes.cross.svg
#       icon-themes/tango_testing/cmd/lc_basicshapes.cube.png
#       icon-themes/tango_testing/cmd/lc_basicshapes.cube.svg
#       
icon-themes/tango_testing/cmd/lc_basicshapes.diamond_lc_flowchartshapes.flowchart-decision.svg
#       icon-themes/tango_testing/cmd/lc_basicshapes.ellipse_lc_ellipse_lc_ellipsetoolbox.svg
#       icon-themes/tango_testing/cmd/lc_basicshapes.frame.png
#       icon-themes/tango_testing/cmd/lc_basicshapes.frame.svg
#       icon-themes/tango_testing/cmd/lc_basicshapes.hexagon.png
#       icon-themes/tango_testing/cmd/lc_basicshapes.hexagon.svg
#       
icon-themes/tango_testing/cmd/lc_basicshapes.isosceles-triangle_lc_flowchartshapes.flowchart-extract.svg
#       icon-themes/tango_testing/cmd/lc_basicshapes.octagon.png
#       icon-themes/tango_testing/cmd/lc_basicshapes.octagon.svg
#       icon-themes/tango_testing/cmd/lc_basicshapes.paper.png
#       icon-themes/tango_testing/cmd/lc_basicshapes.paper.svg
#       icon-themes/tango_testing/cmd/lc_basicshapes.parallelogram.png
#       icon-themes/tango_testing/cmd/lc_basicshapes.rectangle.svg
#       icon-themes/tango_testing/cmd/lc_basicshapes.ring.png
#       icon-themes/tango_testing/cmd/lc_basicshapes.ring.svg
#       
icon-themes/tango_testing/cmd/lc_basicshapes.round-quadrat_lc_flowchartshapes.flowchart-alternate-process.svg
#       icon-themes/tango_testing/cmd/lc_basicshapes.round-rectangle.png
#       icon-themes/tango_testing/cmd/lc_basicshapes.round-rectangle.svg
#       icon-themes/tango_testing/cmd/lc_basicshapes.trapezoid.png
#       icon-themes/tango_testing/cmd/lc_basicshapes.trapezoid.svg
#       icon-themes/tango_testing/cmd/lc_calloutshapes.cloud-callout.png
#       icon-themes/tango_testing/cmd/lc_calloutshapes.cloud-callout.svg
#       icon-themes/tango_testing/cmd/lc_calloutshapes.line-callout-2.png
#       icon-themes/tango_testing/cmd/lc_calloutshapes.line-callout-2.svg
#       icon-themes/tango_testing/cmd/lc_calloutshapes.line-callout-3.png
#       icon-themes/tango_testing/cmd/lc_calloutshapes.line-callout-3.svg
#       icon-themes/tango_testing/cmd/lc_calloutshapes.rectangular-callout.png
#       icon-themes/tango_testing/cmd/lc_calloutshapes.rectangular-callout.svg
#       icon-themes/tango_testing/cmd/lc_calloutshapes.round-rectangular-callout.png
#       icon-themes/tango_testing/cmd/lc_calloutshapes.round-rectangular-callout.svg
#       icon-themes/tango_testing/cmd/lc_circle.png
#       
icon-themes/tango_testing/cmd/lc_drawcaption_lc_calloutshapes_lc_calloutshapes.round-callout.svg
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-alternate-process.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-card.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-card.svg
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-collate.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-collate.svg
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-connector.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-data.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-data.svg
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-decision.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-delay.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-delay.svg
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-direct-access-storage.svg
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-display.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-display.svg
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-document.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-document.svg
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-extract.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-magnetic-disk.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-manual-input.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-manual-input.svg
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-manual-operation.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-manual-operation.svg
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-merge.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-merge.svg
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-multidocument.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-multidocument.svg
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-off-page-connector.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-off-page-connector.svg
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-predefined-process.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-predefined-process.svg
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-preparation.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-process.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-punched-tape.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-punched-tape.svg
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-sequential-access.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-sequential-access.svg
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-sort.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-sort.svg
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-stored-data.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-stored-data.svg
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-summing-junction.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-summing-junction.svg
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-summing-or.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-summing-or.svg
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-terminator.png
#       icon-themes/tango_testing/cmd/lc_flowchartshapes.flowchart-terminator.svg
#       icon-themes/tango_testing/cmd/lc_starshapes.star24.png
#       icon-themes/tango_testing/cmd/lc_starshapes.star24.svg
#       icon-themes/tango_testing/cmd/lc_symbolshapes.cloud.png
#       icon-themes/tango_testing/cmd/lc_symbolshapes.cloud.svg
#       icon-themes/tango_testing/cmd/lc_symbolshapes.quad-bevel.png
#       icon-themes/tango_testing/cmd/lc_symbolshapes.quad-bevel.svg
#       icon-themes/tango_testing/cmd/lc_tabledesign.png
#       icon-themes/tango_testing/cmd/lc_tablesort.png
#       icon-themes/tango_testing/cmd/lc_tablesort.svg
#       icon-themes/tango_testing/cmd/lc_toggleanchortype.png
#       icon-themes/tango_testing/cmd/lc_toggleanchortype.svg
#       icon-themes/tango_testing/cmd/lc_wrapcontour.png
#       icon-themes/tango_testing/cmd/lc_wrapcontour.svg
#       icon-themes/tango_testing/cmd/lc_wrapideal.png
#       icon-themes/tango_testing/cmd/lc_wrapideal.svg
#       icon-themes/tango_testing/cmd/lc_wrapleft.png
#       icon-themes/tango_testing/cmd/lc_wrapleft.svg
#       icon-themes/tango_testing/cmd/lc_wrapoff.png
#       icon-themes/tango_testing/cmd/lc_wrapoff.svg
#       icon-themes/tango_testing/cmd/lc_wrapon.png
#       icon-themes/tango_testing/cmd/lc_wrapon.svg
#       icon-themes/tango_testing/cmd/lc_wrapright.png
#       icon-themes/tango_testing/cmd/lc_wrapright.svg
#       icon-themes/tango_testing/cmd/lc_wrapthrough.png
#       icon-themes/tango_testing/cmd/lc_wrapthrough.svg
#       icon-themes/tango_testing/cmd/sc_charfontname.png
#       icon-themes/tango_testing/cmd/sc_insertdoc.png
#       icon-themes/tango_testing/cmd/sc_insertdoc.svg
#       icon-themes/tango_testing/cmd/sc_insertframe.png
#       icon-themes/tango_testing/cmd/sc_inserthyperlink.png
#       icon-themes/tango_testing/cmd/sc_insertspreadsheet.png
#       icon-themes/tango_testing/cmd/sc_inserttable.png
#       icon-themes/tango_testing/cmd/sc_macrorecorder.png
#       icon-themes/tango_testing/cmd/sc_newdoc.png
#       icon-themes/tango_testing/cmd/sc_newdoc.svg
#       icon-themes/tango_testing/cmd/sc_objectalign.png
#       icon-themes/tango_testing/cmd/sc_objectalign.svg
#       icon-themes/tango_testing/cmd/sc_openurl.png
#       icon-themes/tango_testing/framework/
#       icon-themes/tango_testing/images_tango_testing.zip.tmp
#       icon-themes/tango_testing/sfx2/
#       icu/ExternalPackage_icu.mk
#       icu/ExternalProject_icu.mk
#       icu/Makefile
#       icu/Module_icu.mk
#       icu/UnpackedTarball_icu.mk
#       icu/UnpackedTarball_icu_data.mk
#       icu/icu4c-buffer-overflow.patch
#       libo.log
#       liborcus/vsprojects/
#       naousado.sh
#       offapi/com/sun/star/frame/ToolBarControllerFactory.idl
#       offapi/com/sun/star/frame/XDesktop2.idl
#       offapi/com/sun/star/frame/XToolbarControllerFactory.idl
#       offapi/com/sun/star/sdb/FilterDialog.idl
#       offapi/com/sun/star/sdb/ReportDesign.idl
#       offapi/com/sun/star/sdbc/XConnectionPool.idl
#       offapi/com/sun/star/ui/WindowContentFactoryManager.idl
#       offapi/com/sun/star/ui/XUIElementFactoryManager.idl
#       oox/inc/pch/
#       oox/source/drawingml/shapepropertiescontext.cxx.BACKUP.3459.cxx
#       oox/source/drawingml/shapepropertiescontext.cxx.BACKUP.3766.cxx
#       oox/source/drawingml/shapepropertiescontext.cxx.BASE.3459.cxx
#       oox/source/drawingml/shapepropertiescontext.cxx.BASE.3766.cxx
#       oox/source/drawingml/shapepropertiescontext.cxx.LOCAL.3459.cxx
#       oox/source/drawingml/shapepropertiescontext.cxx.LOCAL.3766.cxx
#       oox/source/drawingml/shapepropertiescontext.cxx.REMOTE.3459.cxx
#       oox/source/drawingml/shapepropertiescontext.cxx.REMOTE.3766.cxx
#       padmin/UI_spa.mk
#       padmin/uiconfig/
#       postprocess/CustomTarget_config.mk
#       postprocess/CustomTarget_images.mk
#       postprocess/CustomTarget_registry.mk
#       postprocess/CustomTarget_signing.mk
#       postprocess/Makefile
#       postprocess/Module_postprocess.mk
#       postprocess/Package_config.mk
#       postprocess/Package_images.mk
#       postprocess/Package_registry.mk
#       postprocess/Rdb_services.mk
#       postprocess/packimages/
#       redland/ExternalPackage_raptor.mk
#       redland/ExternalPackage_rasqal.mk
#       redland/ExternalPackage_redland.mk
#       redland/ExternalProject_raptor.mk
#       redland/ExternalProject_rasqal.mk
#       redland/ExternalProject_redland.mk
#       redland/Library_raptor.mk
#       redland/Library_rasqal.mk
#       redland/Library_rdf.mk
#       redland/Makefile
#       redland/Module_redland.mk
#       redland/UnpackedTarball_raptor.mk
#       redland/UnpackedTarball_rasqal.mk
#       redland/UnpackedTarball_redland.mk
#       redland/raptor/raptor-1.4.18.aix.patch
#       redland/raptor/raptor-1.4.18.autotools.patch
#       redland/raptor/raptor-1.4.18.bundled-soname.patch
#       redland/raptor/raptor-1.4.18.cross.patch
#       redland/raptor/raptor-1.4.18.fixes.patch
#       redland/raptor/raptor-1.4.18.legal.patch
#       redland/raptor/raptor-1.4.18.mingw.patch
#       redland/raptor/raptor-1.4.18.no-soname.patch
#       redland/raptor/raptor-1.4.18.ooo_build.patch
#       redland/raptor/raptor-1.4.18.rindex.patch
#       redland/raptor/raptor-1.4.18.win32.patch
#       redland/raptor/raptor.def
#       redland/rasqal/rasqal-0.9.16.aix.patch
#       redland/rasqal/rasqal-0.9.16.autotools.patch
#       redland/rasqal/rasqal-0.9.16.bundled-soname.patch
#       redland/rasqal/rasqal-0.9.16.legal.patch
#       redland/rasqal/rasqal-0.9.16.mingw.patch
#       redland/rasqal/rasqal-0.9.16.no-soname.patch
#       redland/rasqal/rasqal-0.9.16.ooo_build.patch
#       redland/rasqal/rasqal-0.9.16.win32.patch
#       redland/rasqal/rasqal.def
#       redland/redland/rdf.def
#       redland/redland/redland-1.0.8.aix.patch
#       redland/redland/redland-1.0.8.autotools.patch
#       redland/redland/redland-1.0.8.bundled-soname.patch
#       redland/redland/redland-1.0.8.legal.patch
#       redland/redland/redland-1.0.8.mingw.patch
#       redland/redland/redland-1.0.8.no-soname.patch
#       redland/redland/redland-1.0.8.ooo_build.patch
#       redland/redland/redland-1.0.8.win32.patch
#       sal/inc/pch/
#       sc/inc/pch/
#       sc/source/core/inc/random.hxx
#       sc/source/core/tool/random.cxx
#       scp2/source/python/file_python_librelogo.scp
#       scp2/source/python/module_python_librelogo.scp
#       scp2/source/python/module_python_librelogo.ulf
#       sd/inc/pch/
#       sfx2/inc/sfx2/templatecontaineritem.hxx
#       sfx2/inc/sfx2/templaterepository.hxx
#       sfx2/source/control/templatecontaineritem.cxx
#       sfx2/uiconfig/ui/custominfopage.ui
#       sfx2/uiconfig/ui/descriptioninfopage.ui
#       sfx2/uiconfig/ui/documentinfopage.ui
#       sfx2/uiconfig/ui/documentpropertiesdialog.ui
#       sfx2/uiconfig/ui/internetinfopage.ui
#       sfx2/uiconfig/ui/securityinfopage.ui
#       solenv/bin/update_pch.sh
#       solenv/gbuild/PrecompiledHeaders.mk
#       svtools/inc/pch/
#       svtools/qa/cppunit/data/gif/fail/EDB-23279-1.gif
#       svx/UI_svx.mk
#       svx/inc/pch/
#       svx/uiconfig/
#       sw/inc/pch/
#       sw/qa/extras/odfimport/data/hello.odt
#       sw/qa/extras/ooxmlimport/data/n792778.docx
#       sw/qa/extras/rtfexport/data/fdo53604.odt
#       sw/qa/extras/rtfimport/data/fdo45183.rtf
#       sw/qa/extras/rtfimport/data/fdo49934.rtf
#       sw/qa/extras/rtfimport/data/fdo54612.rtf
#       sw/qa/extras/rtfimport/data/fdo57678.rtf
#       sw/qa/extras/rtfimport/data/fdo57886.rtf
#       sw/qa/extras/rtfimport/data/fdo58076.rtf
#       sw/uiconfig/swriter/ui/captionoptions.ui
#       sw/uiconfig/swriter/ui/columndialog.ui
#       sw/uiconfig/swriter/ui/columnpage.ui
#       sw/uiconfig/swriter/ui/digitalsignature.ui
#       sw/uiconfig/swriter/ui/insertcaption.ui
#       sw/uiconfig/swriter/ui/selectcertificate.ui
#       sw/uiconfig/swriter/ui/statisticsinfopage.ui
#       ure/source/uretest/services.rdb.in
#       vcl/inc/pch/
#       writerfilter/inc/pch/
#       xmloff/inc/pch/
#       xmlsecurity/source/xmlsec/serialnumberadapter.cxx
#       xmlsecurity/source/xmlsec/serialnumberadapter.hxx
no changes added to commit (use "git add" and/or "git commit -a")

-- 
Você está recebendo e-mails da lista dev@pt-br.libreoffice.org
# Informações sobre os comandos disponíveis (em inglês):
  mande e-mail vazio para dev+help@pt-br.libreoffice.org
# Cancelar sua assinatura: mande e-mail vazio para:
  dev+unsubscribe@pt-br.libreoffice.org
# Arquivo de mensagens: http://listarchives.libreoffice.org/pt-br/dev