Here are the commands and output. You can see after I complete the commit,
I try to merge again, and the conflicts remain.
{{{
$ git merge master
Removing src/sage/server/nodoctest.py
Removing src/sage/server/misc.py
Auto-merging src/sage/schemes/projective/projective_point.py
CONFLICT (content): Merge conflict in
src/sage/schemes/projective/projective_point.py
Auto-merging src/sage/schemes/projective/projective_morphism.py
Removing src/sage/plot/hyperbolic_triangle.py
Removing src/sage/misc/bug.py
Auto-merging src/sage/libs/mpfi.pxd
Auto-merging src/sage/libs/mpc.pxd
Removing src/sage/libs/flint/fmpz_poly.pxi
Auto-merging src/sage/libs/flint/fmpz_mat.pxd
Removing src/sage/libs/flint/fmpz.pxi
Removing src/sage/libs/flint/fmpq_poly.pxi
Removing src/sage/ext/python_slice.pxi
Removing src/sage/ext/gmp.pxi
Removing src/sage/databases/lincodes.py
Removing src/sage/databases/install.py
Auto-merging src/sage/data_structures/bitset.pyx
Auto-merging src/sage/data_structures/bitset.pxi
Removing src/ext/singular/sage.lib
Removing src/ext/singular/rrbasis.lib
Removing src/ext/maxima/user/zeta.eps
Removing src/ext/maxima/user/sin-plot.eps
Removing src/ext/magma/user/foo.m
Auto-merging src/doc/en/thematic_tutorials/numerical_sage/scipy.rst
Auto-merging src/doc/en/thematic_tutorials/numerical_sage/numpy.rst
Auto-merging src/doc/en/thematic_tutorials/numerical_sage/index.rst
Removing src/doc/en/reference/dev/index.rst
Removing src/doc/en/reference/dev/conf.py
Removing src/doc/en/reference/combinat/words.rst
Removing src/doc/en/reference/combinat/tableaux.rst
Removing src/doc/en/reference/combinat/symmetric_functions.rst
Removing src/doc/en/reference/combinat/species.rst
Removing src/doc/en/reference/combinat/root_systems_types.rst
Removing src/doc/en/reference/combinat/root_systems.rst
Removing src/doc/en/reference/combinat/rigged_configurations.rst
Removing src/doc/en/reference/combinat/rc_bijections.rst
Removing src/doc/en/reference/combinat/posets.rst
Removing src/doc/en/reference/combinat/partitions.rst
Removing src/doc/en/reference/combinat/ncsym.rst
Removing src/doc/en/reference/combinat/ncsf_qsym.rst
Removing src/doc/en/reference/combinat/developer.rst
Removing src/doc/en/reference/combinat/designs.rst
Removing src/doc/en/reference/combinat/crystals.rst
Removing src/doc/en/reference/combinat/cluster_algebras.rst
Removing src/doc/en/reference/combinat/algebra.rst
Removing src/doc/en/developer/dev_script.rst
Removing src/c_lib/src/gmp_globals.c
Removing src/c_lib/include/gmp_globals.h
Removing src/bin/sage-notebook-insecure
Removing src/bin/sage-crap
Removing build/pkgs/sympy/get-orig-sources
Removing build/pkgs/sympy/README
Removing build/pkgs/sqlalchemy/spkg-install
Removing build/pkgs/sqlalchemy/spkg-check
Removing build/pkgs/sqlalchemy/package-version.txt
Removing build/pkgs/sqlalchemy/checksums.ini
Removing build/pkgs/sqlalchemy/SPKG.txt
Removing build/pkgs/sphinx/patches/sphinx-build
Removing build/pkgs/singular/patches/singular-3.1.6-no_return_type.patch
Removing
build/pkgs/singular/patches/singular-3.1.6-fix_mpoly_factor_segfault.patch
Removing build/pkgs/singular/patches/sage_trac_14295.patch
Removing build/pkgs/singular/patches/osx_link.patch
Removing build/pkgs/singular/patches/no_usr_local.patch
Removing build/pkgs/singular/patches/factory_template_instantiation.patch
Removing build/pkgs/singular/patches/configure_comma.patch
Removing build/pkgs/singular/patches/NTL6_compatibility.patch
Removing build/pkgs/readline/patches/shobj-conf.patch
Removing build/pkgs/pkgconf/patches/install.patch
Removing build/pkgs/mpir/patches/quote_asm.patch
Removing build/pkgs/mpir/patches/mpz__t-scan-bugfix.patch
Removing build/pkgs/mpir/patches/gmp-h.in.patch
Removing build/pkgs/mpir/patches/core-prescott-configure.patch
Removing build/pkgs/mpir/patches/configure.patch
Removing build/pkgs/mpir/patches/configure-cxx.patch
Removing build/pkgs/mpir/patches/clang-config.patch
Removing build/pkgs/mpir/patches/apple.patch
Removing build/pkgs/mercurial/spkg-install
Removing build/pkgs/mercurial/patches/etc_mercurial.patch
Removing build/pkgs/mercurial/package-version.txt
Removing build/pkgs/mercurial/checksums.ini
Removing build/pkgs/mercurial/SPKG.txt
Removing build/pkgs/maxima/spkg-src
Removing build/pkgs/iml/patches/remove_repl.patch
Removing build/pkgs/iml/patches/memleak.patch
Removing build/pkgs/iml/patches/configure_default_cflags.patch
Removing build/pkgs/iml/patches/build.patch
Removing build/pkgs/iml/patches/blas_headers.patch
Removing build/pkgs/gf2x/patches/no-undefined.patch
Removing build/pkgs/genus2reduction/spkg-install
Removing build/pkgs/genus2reduction/package-version.txt
Removing build/pkgs/genus2reduction/checksums.ini
Removing build/pkgs/genus2reduction/SPKG.txt
Removing build/pkgs/gd/spkg-install
Removing build/pkgs/gd/patches/expr
Removing build/pkgs/gd/package-version.txt
Removing build/pkgs/gd/checksums.ini
Removing build/pkgs/gd/SPKG.txt
Removing build/pkgs/gcc/spkg-src
Removing build/pkgs/ecl/patches/infloop.patch
Removing build/pkgs/atlas/patches/threads.patch
Removing build/pkgs/atlas/patches/shell.patch
Removing build/pkgs/atlas/patches/long_filenames.patch
Automatic merge failed; fix conflicts and then commit the result.
$ git mergetool
merge tool candidates: meld opendiff kdiff3 tkdiff xxdiff tortoisemerge
gvimdiff diffuse ecmerge p4merge araxis bc3 emerge vimdiff
Merging:
src/sage/schemes/projective/projective_point.py
Normal merge conflict for 'src/sage/schemes/projective/projective_point.py':
{local}: modified file
{remote}: modified file
Hit return to start merge resolution tool (meld):
$ rm projective_point.py.orig
$ sagetest -dev commit
The following files in your working directory are not tracked by git:
../../../../build/pkgs/arb/SPKG.txt
../../../../build/pkgs/arb/checksums.ini
../../../../build/pkgs/arb/package-version.txt
../../../../build/pkgs/arb/spkg-check
../../../../build/pkgs/arb/spkg-install
../../../../build/pkgs/atlas/patches/cygwin_threads.patch
../../../../build/pkgs/bliss/SPKG.txt
../../../../build/pkgs/bliss/checksums.ini
../../../../build/pkgs/bliss/package-version.txt
../../../../build/pkgs/bliss/patches/digraph_heuristic.patch
../../../../build/pkgs/bliss/spkg-install
../../../../build/pkgs/compilerwrapper/SPKG.txt
../../../../build/pkgs/compilerwrapper/checksums.ini
../../../../build/pkgs/compilerwrapper/package-version.txt
../../../../build/pkgs/compilerwrapper/spkg-install
../../../../build/pkgs/flint/patches/ntl62.patch
../../../../build/pkgs/fricas/SPKG.txt
../../../../build/pkgs/fricas/checksums.ini
../../../../build/pkgs/fricas/package-version.txt
../../../../build/pkgs/fricas/spkg-install
../../../../build/pkgs/gambit/SPKG.txt
../../../../build/pkgs/gambit/checksums.ini
../../../../build/pkgs/gambit/package-version.txt
../../../../build/pkgs/gambit/spkg-install
../../../../build/pkgs/gcc/patches/bug-63661.patch
../../../../build/pkgs/gcc/patches/bug-63740.patch
../../../../build/pkgs/gf2x/patches/0001-Trac-15014-Let-gf2x-build-a-shared-library-on-
Cygwin.patch
../../../../build/pkgs/gf2x/patches/0002-tr-portability.patch
../../../../build/pkgs/gf2x/patches/0003-Improve-detection-of-sse2-support.patch
../../../../build/pkgs/gf2x/patches/0004-Add-disable-hardware-specific-code.patch
../../../../build/pkgs/gf2x/patches/0005-Update-autotooled-files.patch
../../../../build/pkgs/glpk/patches/build_system/cygwin_sharedlib.patch
../../../../build/pkgs/glpk/patches/build_system/zlib.patch
../../../../build/pkgs/glpk/patches/cygwin_sharedlib.patch
../../../../build/pkgs/glpk/patches/zlib.patch
../../../../build/pkgs/iml/patches/gsl_cblas.h
../../../../build/pkgs/ipython/patches/ultratb-master.patch
../../../../build/pkgs/latte_int/SPKG.txt
../../../../build/pkgs/latte_int/checksums.ini
../../../../build/pkgs/latte_int/package-version.txt
../../../../build/pkgs/latte_int/spkg-check
../../../../build/pkgs/latte_int/spkg-install
../../../../build/pkgs/libgd/SPKG.txt
../../../../build/pkgs/libgd/checksums.ini
../../../../build/pkgs/libgd/package-version.txt
../../../../build/pkgs/libgd/patches/ceill.patch
../../../../build/pkgs/libgd/spkg-install
../../../../build/pkgs/libgd/spkg-src
../../../../build/pkgs/m4ri/patches/sizeof_mzd_t.patch
../../../../build/pkgs/maxima/patches/makeinfo.patch
../../../../build/pkgs/normaliz/SPKG.txt
../../../../build/pkgs/normaliz/checksums.ini
../../../../build/pkgs/normaliz/package-version.txt
../../../../build/pkgs/normaliz/patches/cstddef_include.patch
../../../../build/pkgs/normaliz/patches/no_static_stuff.patch
../../../../build/pkgs/normaliz/spkg-install
../../../../build/pkgs/plantri/SPKG.txt
../../../../build/pkgs/plantri/checksums.ini
../../../../build/pkgs/plantri/package-version.txt
../../../../build/pkgs/plantri/spkg-install
../../../../build/pkgs/ppl/patches/weak.patch
../../../../build/pkgs/r/patches/parent_sig_handler.patch
../../../../build/pkgs/readline/patches/0001-macports.patch
../../../../build/pkgs/readline/patches/0002-ltinfo.patch
../../../../build/pkgs/readline/patches/sigsetjmp.patch
../../../../build/pkgs/singular/patches/conditional/cygwin64_debug.patch
../../../../build/pkgs/singular/patches/currring.patch
../../../../build/pkgs/singular/patches/templates.patch
../../../../build/pkgs/sphinx/patches/inline-latex.patch
../../../../build/pkgs/sympy/patches/01_no-mpmath.patch
../../../../build/pkgs/valgrind/SPKG.txt
../../../../build/pkgs/valgrind/checksums.ini
../../../../build/pkgs/valgrind/package-version.txt
../../../../build/pkgs/valgrind/spkg-check
../../../../build/pkgs/valgrind/spkg-install
../../../../build/pkgs/zeromq/patches/build_system/cxx_compiler.patch
../../../../build/pkgs/zeromq/patches/build_system/cygwin_sharedlib.patch
../../../../build/pkgs/zeromq/patches/cxx_compiler.patch
../../../../build/pkgs/zeromq/patches/cygwin_sharedlib.patch
../../../../m4/ax_check_root.m4
../../../doc/ca/intro/conf.py
../../../doc/ca/intro/index.rst
../../../doc/en/developer/reviewer_checklist.rst
../../../doc/en/reference/combinat/module_list.rst
../../../doc/en/reference/data_structures/conf.py
../../../doc/en/reference/data_structures/index.rst
../../../doc/en/thematic_tutorials/cython_interface.rst
../../../doc/en/thematic_tutorials/numerical_sage/comparison_to_cython.rst
../../../doc/en/thematic_tutorials/numerical_sage/conf.py
../../../doc/en/thematic_tutorials/numerical_sage/ctypes.rst
../../../doc/en/thematic_tutorials/numerical_sage/ctypes_examples.rst
../../../doc/en/thematic_tutorials/numerical_sage/cvxopt.rst
../../../doc/en/thematic_tutorials/numerical_sage/f2py.rst
../../../doc/en/thematic_tutorials/numerical_sage/f2py_examples.rst
../../../doc/en/thematic_tutorials/numerical_sage/index.rst
../../../doc/en/thematic_tutorials/numerical_sage/installation.rst
../../../doc/en/thematic_tutorials/numerical_sage/installation_linux.rst
../../../doc/en/thematic_tutorials/numerical_sage/installation_osx.rst
../../../doc/en/thematic_tutorials/numerical_sage/mpi4py.rst
../../../doc/en/thematic_tutorials/numerical_sage/numerical_tools.rst
../../../doc/en/thematic_tutorials/numerical_sage/numpy.rst
../../../doc/en/thematic_tutorials/numerical_sage/parallel_computation.rst
../../../doc/en/thematic_tutorials/numerical_sage/parallel_laplace_solver.rst
../../../doc/en/thematic_tutorials/numerical_sage/plotting.rst
../../../doc/en/thematic_tutorials/numerical_sage/scipy.rst
../../../doc/en/thematic_tutorials/numerical_sage/using_compiled_code_iteractively.rst
../../../doc/en/thematic_tutorials/numerical_sage/visualization.rst
../../../doc/en/thematic_tutorials/numerical_sage/weave.rst
../../../doc/en/thematic_tutorials/polytutorial.rst
../../../doc/hu/a_tour_of_sage/conf.py
../../../doc/hu/a_tour_of_sage/eigen_plot.png
../../../doc/hu/a_tour_of_sage/index.rst
../../../doc/hu/a_tour_of_sage/sin_plot.png
../../../ext/notebook-ipython/static/sage-logo.png
../../../ext/notebook-ipython/templates/404.html
../../../ext/notebook-ipython/templates/error.html
../../../ext/notebook-ipython/templates/login.html
../../../ext/notebook-ipython/templates/logout.html
../../../ext/notebook-ipython/templates/notebook.html
../../../ext/notebook-ipython/templates/page.html
../../../ext/notebook-ipython/templates/tree.html
../../../ext/valgrind/pyalloc.supp
../../../ext/valgrind/sage-additional.supp
../../../ext/valgrind/sage.supp
../../algebras/catalog.py
../../algebras/clifford_algebra.py
../../algebras/commutative_dga.py
../../algebras/weyl_algebra.py
../../categories/homsets.py
../../combinat/algebraic_combinatorics.py
../../combinat/catalog_partitions.py
../../combinat/counting.py
../../combinat/designs/group_divisible_designs.py
../../combinat/designs/resolvable_bibd.py
../../combinat/enumerated_sets.py
../../combinat/quickref.py
../../combinat/root_system/type_marked.py
../../data_structures/__init__.py
../../data_structures/all.py
../../data_structures/bitset.pxd
../../data_structures/bitset.pxi
../../data_structures/bitset.pyx
../../data_structures/bounded_integer_sequences.pxd
../../data_structures/bounded_integer_sequences.pyx
../../doctest/fixtures.py
../../game_theory/gambit_docs.py
../../game_theory/matching_game.py
../../game_theory/normal_form_game.py
../../game_theory/parser.py
../../graphs/graph_decompositions/bandwidth.pyx
../../groups/perm_gps/symgp_conjugacy_class.py
../../libs/flint/arith.pxd
../../libs/flint/fmpq.pxd
../../libs/flint/fmpq_poly.pxd
../../libs/flint/fmpz.pxd
../../libs/flint/fmpz_mat.pxd
../../libs/flint/fmpz_vec.pxd
../../libs/flint/types.pxd
../../libs/gmp/rational_reconstruction.pxd
../../libs/gmp/rational_reconstruction.pyx
../../libs/mpc.pxd
../../libs/mpfi.pxd
../../modular/modform_hecketriangle/hecke_triangle_group_element.py
../../plot/histogram.py
../../plot/hyperbolic_polygon.py
../../repl/attach.py
../../repl/load.py
../../repl/notebook_ipython.py
../../repl/preparse.py
../../repl/zmq_kernel.py
../product_projective/__init__.py
../product_projective/all.py
../product_projective/homset.py
../product_projective/morphism.py
../product_projective/point.py
../product_projective/space.py
../../structure/graphics_file.py
$ sagetest -dev commit
The following files in your working directory are not tracked by git:
../../../../build/pkgs/arb/SPKG.txt
../../../../build/pkgs/arb/checksums.ini
../../../../build/pkgs/arb/package-version.txt
../../../../build/pkgs/arb/spkg-check
../../../../build/pkgs/arb/spkg-install
../../../../build/pkgs/atlas/patches/cygwin_threads.patch
../../../../build/pkgs/bliss/SPKG.txt
../../../../build/pkgs/bliss/checksums.ini
../../../../build/pkgs/bliss/package-version.txt
../../../../build/pkgs/bliss/patches/digraph_heuristic.patch
../../../../build/pkgs/bliss/spkg-install
../../../../build/pkgs/compilerwrapper/SPKG.txt
../../../../build/pkgs/compilerwrapper/checksums.ini
../../../../build/pkgs/compilerwrapper/package-version.txt
../../../../build/pkgs/compilerwrapper/spkg-install
../../../../build/pkgs/flint/patches/ntl62.patch
../../../../build/pkgs/fricas/SPKG.txt
../../../../build/pkgs/fricas/checksums.ini
../../../../build/pkgs/fricas/package-version.txt
../../../../build/pkgs/fricas/spkg-install
../../../../build/pkgs/gambit/SPKG.txt
../../../../build/pkgs/gambit/checksums.ini
../../../../build/pkgs/gambit/package-version.txt
../../../../build/pkgs/gambit/spkg-install
../../../../build/pkgs/gcc/patches/bug-63661.patch
../../../../build/pkgs/gcc/patches/bug-63740.patch
../../../../build/pkgs/gf2x/patches/0001-Trac-15014-Let-gf2x-build-a-shared-library-on-
Cygwin.patch
../../../../build/pkgs/gf2x/patches/0002-tr-portability.patch
../../../../build/pkgs/gf2x/patches/0003-Improve-detection-of-sse2-support.patch
../../../../build/pkgs/gf2x/patches/0004-Add-disable-hardware-specific-code.patch
../../../../build/pkgs/gf2x/patches/0005-Update-autotooled-files.patch
../../../../build/pkgs/glpk/patches/build_system/cygwin_sharedlib.patch
../../../../build/pkgs/glpk/patches/build_system/zlib.patch
../../../../build/pkgs/glpk/patches/cygwin_sharedlib.patch
../../../../build/pkgs/glpk/patches/zlib.patch
../../../../build/pkgs/iml/patches/gsl_cblas.h
../../../../build/pkgs/ipython/patches/ultratb-master.patch
../../../../build/pkgs/latte_int/SPKG.txt
../../../../build/pkgs/latte_int/checksums.ini
../../../../build/pkgs/latte_int/package-version.txt
../../../../build/pkgs/latte_int/spkg-check
../../../../build/pkgs/latte_int/spkg-install
../../../../build/pkgs/libgd/SPKG.txt
../../../../build/pkgs/libgd/checksums.ini
../../../../build/pkgs/libgd/package-version.txt
../../../../build/pkgs/libgd/patches/ceill.patch
../../../../build/pkgs/libgd/spkg-install
../../../../build/pkgs/libgd/spkg-src
../../../../build/pkgs/m4ri/patches/sizeof_mzd_t.patch
../../../../build/pkgs/maxima/patches/makeinfo.patch
../../../../build/pkgs/normaliz/SPKG.txt
../../../../build/pkgs/normaliz/checksums.ini
../../../../build/pkgs/normaliz/package-version.txt
../../../../build/pkgs/normaliz/patches/cstddef_include.patch
../../../../build/pkgs/normaliz/patches/no_static_stuff.patch
../../../../build/pkgs/normaliz/spkg-install
../../../../build/pkgs/plantri/SPKG.txt
../../../../build/pkgs/plantri/checksums.ini
../../../../build/pkgs/plantri/package-version.txt
../../../../build/pkgs/plantri/spkg-install
../../../../build/pkgs/ppl/patches/weak.patch
../../../../build/pkgs/r/patches/parent_sig_handler.patch
../../../../build/pkgs/readline/patches/0001-macports.patch
../../../../build/pkgs/readline/patches/0002-ltinfo.patch
../../../../build/pkgs/readline/patches/sigsetjmp.patch
../../../../build/pkgs/singular/patches/conditional/cygwin64_debug.patch
../../../../build/pkgs/singular/patches/currring.patch
../../../../build/pkgs/singular/patches/templates.patch
../../../../build/pkgs/sphinx/patches/inline-latex.patch
../../../../build/pkgs/sympy/patches/01_no-mpmath.patch
../../../../build/pkgs/valgrind/SPKG.txt
../../../../build/pkgs/valgrind/checksums.ini
../../../../build/pkgs/valgrind/package-version.txt
../../../../build/pkgs/valgrind/spkg-check
../../../../build/pkgs/valgrind/spkg-install
../../../../build/pkgs/zeromq/patches/build_system/cxx_compiler.patch
../../../../build/pkgs/zeromq/patches/build_system/cygwin_sharedlib.patch
../../../../build/pkgs/zeromq/patches/cxx_compiler.patch
../../../../build/pkgs/zeromq/patches/cygwin_sharedlib.patch
../../../../m4/ax_check_root.m4
../../../doc/ca/intro/conf.py
../../../doc/ca/intro/index.rst
../../../doc/en/developer/reviewer_checklist.rst
../../../doc/en/reference/combinat/module_list.rst
../../../doc/en/reference/data_structures/conf.py
../../../doc/en/reference/data_structures/index.rst
../../../doc/en/thematic_tutorials/cython_interface.rst
../../../doc/en/thematic_tutorials/numerical_sage/comparison_to_cython.rst
../../../doc/en/thematic_tutorials/numerical_sage/conf.py
../../../doc/en/thematic_tutorials/numerical_sage/ctypes.rst
../../../doc/en/thematic_tutorials/numerical_sage/ctypes_examples.rst
../../../doc/en/thematic_tutorials/numerical_sage/cvxopt.rst
../../../doc/en/thematic_tutorials/numerical_sage/f2py.rst
../../../doc/en/thematic_tutorials/numerical_sage/f2py_examples.rst
../../../doc/en/thematic_tutorials/numerical_sage/index.rst
../../../doc/en/thematic_tutorials/numerical_sage/installation.rst
../../../doc/en/thematic_tutorials/numerical_sage/installation_linux.rst
../../../doc/en/thematic_tutorials/numerical_sage/installation_osx.rst
../../../doc/en/thematic_tutorials/numerical_sage/mpi4py.rst
../../../doc/en/thematic_tutorials/numerical_sage/numerical_tools.rst
../../../doc/en/thematic_tutorials/numerical_sage/numpy.rst
../../../doc/en/thematic_tutorials/numerical_sage/parallel_computation.rst
../../../doc/en/thematic_tutorials/numerical_sage/parallel_laplace_solver.rst
../../../doc/en/thematic_tutorials/numerical_sage/plotting.rst
../../../doc/en/thematic_tutorials/numerical_sage/scipy.rst
../../../doc/en/thematic_tutorials/numerical_sage/using_compiled_code_iteractively.rst
../../../doc/en/thematic_tutorials/numerical_sage/visualization.rst
../../../doc/en/thematic_tutorials/numerical_sage/weave.rst
../../../doc/en/thematic_tutorials/polytutorial.rst
../../../doc/hu/a_tour_of_sage/conf.py
../../../doc/hu/a_tour_of_sage/eigen_plot.png
../../../doc/hu/a_tour_of_sage/index.rst
../../../doc/hu/a_tour_of_sage/sin_plot.png
../../../ext/notebook-ipython/static/sage-logo.png
../../../ext/notebook-ipython/templates/404.html
../../../ext/notebook-ipython/templates/error.html
../../../ext/notebook-ipython/templates/login.html
../../../ext/notebook-ipython/templates/logout.html
../../../ext/notebook-ipython/templates/notebook.html
../../../ext/notebook-ipython/templates/page.html
../../../ext/notebook-ipython/templates/tree.html
../../../ext/valgrind/pyalloc.supp
../../../ext/valgrind/sage-additional.supp
../../../ext/valgrind/sage.supp
../../algebras/catalog.py
../../algebras/clifford_algebra.py
../../algebras/commutative_dga.py
../../algebras/weyl_algebra.py
../../categories/homsets.py
../../combinat/algebraic_combinatorics.py
../../combinat/catalog_partitions.py
../../combinat/counting.py
../../combinat/designs/group_divisible_designs.py
../../combinat/designs/resolvable_bibd.py
../../combinat/enumerated_sets.py
../../combinat/quickref.py
../../combinat/root_system/type_marked.py
../../data_structures/__init__.py
../../data_structures/all.py
../../data_structures/bitset.pxd
../../data_structures/bitset.pxi
../../data_structures/bitset.pyx
../../data_structures/bounded_integer_sequences.pxd
../../data_structures/bounded_integer_sequences.pyx
../../doctest/fixtures.py
../../game_theory/gambit_docs.py
../../game_theory/matching_game.py
../../game_theory/normal_form_game.py
../../game_theory/parser.py
../../graphs/graph_decompositions/bandwidth.pyx
../../groups/perm_gps/symgp_conjugacy_class.py
../../libs/flint/arith.pxd
../../libs/flint/fmpq.pxd
../../libs/flint/fmpq_poly.pxd
../../libs/flint/fmpz.pxd
../../libs/flint/fmpz_mat.pxd
../../libs/flint/fmpz_vec.pxd
../../libs/flint/types.pxd
../../libs/gmp/rational_reconstruction.pxd
../../libs/gmp/rational_reconstruction.pyx
../../libs/mpc.pxd
../../libs/mpfi.pxd
../../modular/modform_hecketriangle/hecke_triangle_group_element.py
../../plot/histogram.py
../../plot/hyperbolic_polygon.py
../../repl/attach.py
../../repl/load.py
../../repl/notebook_ipython.py
../../repl/preparse.py
../../repl/zmq_kernel.py
../product_projective/__init__.py
../product_projective/all.py
../product_projective/homset.py
../product_projective/morphism.py
../product_projective/point.py
../product_projective/space.py
../../structure/graphics_file.py
Start tracking any of these files? [yes/No] y
Start tracking "../../../../build/pkgs/arb/SPKG.txt"? [yes/No] y
Start tracking "../../../../build/pkgs/arb/checksums.ini"? [yes/No] y
Start tracking "../../../../build/pkgs/arb/package-version.txt"? [yes/No] y
Start tracking "../../../../build/pkgs/arb/spkg-check"? [yes/No] y
Start tracking "../../../../build/pkgs/arb/spkg-install"? [yes/No] y
Start tracking "../../../../build/pkgs/atlas/patches/cygwin_threads.patch"?
[yes/No] y
Start tracking "../../../../build/pkgs/bliss/SPKG.txt"? [yes/No] y
Start tracking "../../../../build/pkgs/bliss/checksums.ini"? [yes/No] y
Start tracking "../../../../build/pkgs/bliss/package-version.txt"? [yes/No]
y
Start tracking
"../../../../build/pkgs/bliss/patches/digraph_heuristic.patch"? [yes/No] y
Start tracking "../../../../build/pkgs/bliss/spkg-install"? [yes/No] y
Start tracking "../../../../build/pkgs/compilerwrapper/SPKG.txt"? [yes/No] y
Start tracking "../../../../build/pkgs/compilerwrapper/checksums.ini"?
[yes/No] y
Start tracking
"../../../../build/pkgs/compilerwrapper/package-version.txt"? [yes/No] y
Start tracking "../../../../build/pkgs/compilerwrapper/spkg-install"?
[yes/No] y
Start tracking "../../../../build/pkgs/flint/patches/ntl62.patch"? [yes/No]
y
Start tracking "../../../../build/pkgs/fricas/SPKG.txt"? [yes/No] y
Start tracking "../../../../build/pkgs/fricas/checksums.ini"? [yes/No] y
Start tracking "../../../../build/pkgs/fricas/package-version.txt"?
[yes/No] y
yStart tracking "../../../../build/pkgs/fricas/spkg-install"? [yes/No]
Start tracking "../../../../build/pkgs/gambit/SPKG.txt"? [yes/No] y
Start tracking "../../../../build/pkgs/gambit/checksums.ini"? [yes/No] y
Start tracking "../../../../build/pkgs/gambit/package-version.txt"?
[yes/No] y
Start tracking "../../../../build/pkgs/gambit/spkg-install"? [yes/No] y
Start tracking "../../../../build/pkgs/gcc/patches/bug-63661.patch"?
[yes/No] y
Start tracking "../../../../build/pkgs/gcc/patches/bug-63740.patch"?
[yes/No] y
Start tracking
"../../../../build/pkgs/gf2x/patches/0001-Trac-15014-Let-gf2x-build-a-shared-library-on-Cygwin.patch"?
[yes/No] y
Start tracking
"../../../../build/pkgs/gf2x/patches/0002-tr-portability.patch"? [yes/No] y
Start tracking
"../../../../build/pkgs/gf2x/patches/0003-Improve-detection-of-sse2-support.patch"?
[yes/No] y
Start tracking
"../../../../build/pkgs/gf2x/patches/0004-Add-disable-hardware-specific-code.patch"?
[yes/No] y
Start tracking
"../../../../build/pkgs/gf2x/patches/0005-Update-autotooled-files.patch"?
[yes/No] y
Start tracking
"../../../../build/pkgs/glpk/patches/build_system/cygwin_sharedlib.patch"?
[yes/No] y
Start tracking
"../../../../build/pkgs/glpk/patches/build_system/zlib.patch"? [yes/No] y
Start tracking
"../../../../build/pkgs/glpk/patches/cygwin_sharedlib.patch"? [yes/No] y
Start tracking "../../../../build/pkgs/glpk/patches/zlib.patch"? [yes/No] y
Start tracking "../../../../build/pkgs/iml/patches/gsl_cblas.h"? [yes/No] y
Start tracking
"../../../../build/pkgs/ipython/patches/ultratb-master.patch"? [yes/No] y
Start tracking "../../../../build/pkgs/latte_int/SPKG.txt"? [yes/No] y
Start tracking "../../../../build/pkgs/latte_int/checksums.ini"? [yes/No] y
Start tracking "../../../../build/pkgs/latte_int/package-version.txt"?
[yes/No] y
Start tracking "../../../../build/pkgs/latte_int/spkg-check"? [yes/No] y
Start tracking "../../../../build/pkgs/latte_int/spkg-install"? [yes/No] y
Start tracking "../../../../build/pkgs/libgd/SPKG.txt"? [yes/No] y
Start tracking "../../../../build/pkgs/libgd/checksums.ini"? [yes/No] y
Start tracking "../../../../build/pkgs/libgd/package-version.txt"? [yes/No]
y
Start tracking "../../../../build/pkgs/libgd/patches/ceill.patch"? [yes/No]
y
Start tracking "../../../../build/pkgs/libgd/spkg-install"? [yes/No] y
Start tracking "../../../../build/pkgs/libgd/spkg-src"? [yes/No] y
Start tracking "../../../../build/pkgs/m4ri/patches/sizeof_mzd_t.patch"?
[yes/No] y
Start tracking "../../../../build/pkgs/maxima/patches/makeinfo.patch"?
[yes/No] y
Start tracking "../../../../build/pkgs/normaliz/SPKG.txt"? [yes/No] y
Start tracking "../../../../build/pkgs/normaliz/checksums.ini"? [yes/No] y
Start tracking "../../../../build/pkgs/normaliz/package-version.txt"?
[yes/No] y
Start tracking
"../../../../build/pkgs/normaliz/patches/cstddef_include.patch"? [yes/No] y
Start tracking
"../../../../build/pkgs/normaliz/patches/no_static_stuff.patch"? [yes/No] y
Start tracking "../../../../build/pkgs/normaliz/spkg-install"? [yes/No] y
Start tracking "../../../../build/pkgs/plantri/SPKG.txt"? [yes/No] y
Start tracking "../../../../build/pkgs/plantri/checksums.ini"? [yes/No] y
Start tracking "../../../../build/pkgs/plantri/package-version.txt"?
[yes/No] y
Start tracking "../../../../build/pkgs/plantri/spkg-install"? [yes/No] y
Start tracking "../../../../build/pkgs/ppl/patches/weak.patch"? [yes/No] y
Start tracking "../../../../build/pkgs/r/patches/parent_sig_handler.patch"?
[yes/No] y
Start tracking
"../../../../build/pkgs/readline/patches/0001-macports.patch"? [yes/No] y
Start tracking "../../../../build/pkgs/readline/patches/0002-ltinfo.patch"?
[yes/No] y
Start tracking "../../../../build/pkgs/readline/patches/sigsetjmp.patch"?
[yes/No] y
Start tracking
"../../../../build/pkgs/singular/patches/conditional/cygwin64_debug.patch"?
[yes/No] y
Start tracking "../../../../build/pkgs/singular/patches/currring.patch"?
[yes/No] y
Start tracking "../../../../build/pkgs/singular/patches/templates.patch"?
[yes/No] y
Start tracking "../../../../build/pkgs/sphinx/patches/inline-latex.patch"?
[yes/No] y
Start tracking "../../../../build/pkgs/sympy/patches/01_no-mpmath.patch"?
[yes/No] y
Start tracking "../../../../build/pkgs/valgrind/SPKG.txt"? [yes/No] y
Start tracking "../../../../build/pkgs/valgrind/checksums.ini"? [yes/No] y
Start tracking "../../../../build/pkgs/valgrind/package-version.txt"?
[yes/No] y
Start tracking "../../../../build/pkgs/valgrind/spkg-check"? [yes/No] y
Start tracking "../../../../build/pkgs/valgrind/spkg-install"? [yes/No] y
Start tracking
"../../../../build/pkgs/zeromq/patches/build_system/cxx_compiler.patch"?
[yes/No] y
Start tracking
"../../../../build/pkgs/zeromq/patches/build_system/cygwin_sharedlib.patch"?
[yes/No] y
Start tracking "../../../../build/pkgs/zeromq/patches/cxx_compiler.patch"?
[yes/No] y
Start tracking
"../../../../build/pkgs/zeromq/patches/cygwin_sharedlib.patch"? [yes/No] y
Start tracking "../../../../m4/ax_check_root.m4"? [yes/No] y
Start tracking "../../../doc/ca/intro/conf.py"? [yes/No] y
Start tracking "../../../doc/ca/intro/index.rst"? [yes/No] y
Start tracking "../../../doc/en/developer/reviewer_checklist.rst"? [yes/No]
y
Start tracking "../../../doc/en/reference/combinat/module_list.rst"?
[yes/No] y
Start tracking "../../../doc/en/reference/data_structures/conf.py"?
[yes/No] y
Start tracking "../../../doc/en/reference/data_structures/index.rst"?
[yes/No] y
Start tracking "../../../doc/en/thematic_tutorials/cython_interface.rst"?
[yes/No] y
Start tracking
"../../../doc/en/thematic_tutorials/numerical_sage/comparison_to_cython.rst"?
[yes/No] y
Start tracking "../../../doc/en/thematic_tutorials/numerical_sage/conf.py"?
[yes/No] y
Start tracking
"../../../doc/en/thematic_tutorials/numerical_sage/ctypes.rst"? [yes/No] y
Start tracking
"../../../doc/en/thematic_tutorials/numerical_sage/ctypes_examples.rst"?
[yes/No] y
Start tracking
"../../../doc/en/thematic_tutorials/numerical_sage/cvxopt.rst"? [yes/No] y
Start tracking
"../../../doc/en/thematic_tutorials/numerical_sage/f2py.rst"? [yes/No] y
Start tracking
"../../../doc/en/thematic_tutorials/numerical_sage/f2py_examples.rst"?
[yes/No] y
Start tracking
"../../../doc/en/thematic_tutorials/numerical_sage/index.rst"? [yes/No] y
Start tracking
"../../../doc/en/thematic_tutorials/numerical_sage/installation.rst"?
[yes/No] y
Start tracking
"../../../doc/en/thematic_tutorials/numerical_sage/installation_linux.rst"?
[yes/No] y
Start tracking
"../../../doc/en/thematic_tutorials/numerical_sage/installation_osx.rst"?
[yes/No] y
Start tracking
"../../../doc/en/thematic_tutorials/numerical_sage/mpi4py.rst"? [yes/No] y
Start tracking
"../../../doc/en/thematic_tutorials/numerical_sage/numerical_tools.rst"?
[yes/No] y
Start tracking
"../../../doc/en/thematic_tutorials/numerical_sage/numpy.rst"? [yes/No] y
Start tracking
"../../../doc/en/thematic_tutorials/numerical_sage/parallel_computation.rst"?
[yes/No] y
Start tracking
"../../../doc/en/thematic_tutorials/numerical_sage/parallel_laplace_solver.rst"?
[yes/No] y
Start tracking
"../../../doc/en/thematic_tutorials/numerical_sage/plotting.rst"? [yes/No] y
Start tracking
"../../../doc/en/thematic_tutorials/numerical_sage/scipy.rst"? [yes/No] y
Start tracking
"../../../doc/en/thematic_tutorials/numerical_sage/using_compiled_code_iteractively.rst"?
[yes/No] y
Start tracking
"../../../doc/en/thematic_tutorials/numerical_sage/visualization.rst"?
[yes/No] y
Start tracking
"../../../doc/en/thematic_tutorials/numerical_sage/weave.rst"? [yes/No] y
Start tracking "../../../doc/en/thematic_tutorials/polytutorial.rst"?
[yes/No] y
Start tracking "../../../doc/hu/a_tour_of_sage/conf.py"? [yes/No] y
Start tracking "../../../doc/hu/a_tour_of_sage/eigen_plot.png"? [yes/No] y
Start tracking "../../../doc/hu/a_tour_of_sage/index.rst"? [yes/No] y
Start tracking "../../../doc/hu/a_tour_of_sage/sin_plot.png"? [yes/No] y
Start tracking "../../../ext/notebook-ipython/static/sage-logo.png"?
[yes/No] y
Start tracking "../../../ext/notebook-ipython/templates/404.html"? [yes/No]
y
Start tracking "../../../ext/notebook-ipython/templates/error.html"?
[yes/No] y
Start tracking "../../../ext/notebook-ipython/templates/login.html"?
[yes/No] y
Start tracking "../../../ext/notebook-ipython/templates/logout.html"?
[yes/No] y
Start tracking "../../../ext/notebook-ipython/templates/notebook.html"?
[yes/No] y
Start tracking "../../../ext/notebook-ipython/templates/page.html"?
[yes/No] y
Start tracking "../../../ext/notebook-ipython/templates/tree.html"?
[yes/No] y
Start tracking "../../../ext/valgrind/pyalloc.supp"? [yes/No] y
Start tracking "../../../ext/valgrind/sage-additional.supp"? [yes/No] y
Start tracking "../../../ext/valgrind/sage.supp"? [yes/No] y
Start tracking "../../algebras/catalog.py"? [yes/No] y
Start tracking "../../algebras/clifford_algebra.py"? [yes/No] y
Start tracking "../../algebras/commutative_dga.py"? [yes/No] y
Start tracking "../../algebras/weyl_algebra.py"? [yes/No] y
Start tracking "../../categories/homsets.py"? [yes/No] y
Start tracking "../../combinat/algebraic_combinatorics.py"? [yes/No] y
Start tracking "../../combinat/catalog_partitions.py"? [yes/No] y
Start tracking "../../combinat/counting.py"? [yes/No] y
Start tracking "../../combinat/designs/group_divisible_designs.py"?
[yes/No] y
Start tracking "../../combinat/designs/resolvable_bibd.py"? [yes/No] y
Start tracking "../../combinat/enumerated_sets.py"? [yes/No] y
Start tracking "../../combinat/quickref.py"? [yes/No] y
Start tracking "../../combinat/root_system/type_marked.py"? [yes/No] y
Start tracking "../../data_structures/__init__.py"? [yes/No] y
Start tracking "../../data_structures/all.py"? [yes/No] y
Start tracking "../../data_structures/bitset.pxd"? [yes/No] y
Start tracking "../../data_structures/bitset.pxi"? [yes/No] y
Start tracking "../../data_structures/bitset.pyx"? [yes/No] y
Start tracking "../../data_structures/bounded_integer_sequences.pxd"?
[yes/No] y
Start tracking "../../data_structures/bounded_integer_sequences.pyx"?
[yes/No] y
Start tracking "../../doctest/fixtures.py"? [yes/No] y
Start tracking "../../game_theory/gambit_docs.py"? [yes/No] y
Start tracking "../../game_theory/matching_game.py"? [yes/No] y
Start tracking "../../game_theory/normal_form_game.py"? [yes/No] y
Start tracking "../../game_theory/parser.py"? [yes/No] y
Start tracking "../../graphs/graph_decompositions/bandwidth.pyx"? [yes/No] y
Start tracking "../../groups/perm_gps/symgp_conjugacy_class.py"? [yes/No] y
Start tracking "../../libs/flint/arith.pxd"? [yes/No] y
Start tracking "../../libs/flint/fmpq.pxd"? [yes/No] y
Start tracking "../../libs/flint/fmpq_poly.pxd"? [yes/No] y
Start tracking "../../libs/flint/fmpz.pxd"? [yes/No] y
Start tracking "../../libs/flint/fmpz_mat.pxd"? [yes/No] y
Start tracking "../../libs/flint/fmpz_vec.pxd"? [yes/No] y
Start tracking "../../libs/flint/types.pxd"? [yes/No] y
Start tracking "../../libs/gmp/rational_reconstruction.pxd"? [yes/No] y
Start tracking "../../libs/gmp/rational_reconstruction.pyx"? [yes/No] y
Start tracking "../../libs/mpc.pxd"? [yes/No] y
Start tracking "../../libs/mpfi.pxd"? [yes/No] y
Start tracking
"../../modular/modform_hecketriangle/hecke_triangle_group_element.py"?
[yes/No] y
Start tracking "../../plot/histogram.py"? [yes/No] y
Start tracking "../../plot/hyperbolic_polygon.py"? [yes/No] y
Start tracking "../../repl/attach.py"? [yes/No] y
Start tracking "../../repl/load.py"? [yes/No] y
Start tracking "../../repl/notebook_ipython.py"? [yes/No] y
Start tracking "../../repl/preparse.py"? [yes/No] y
Start tracking "../../repl/zmq_kernel.py"? [yes/No] y
Start tracking "../product_projective/__init__.py"? [yes/No] y
Start tracking "../product_projective/all.py"? [yes/No] y
Start tracking "../product_projective/homset.py"? [yes/No] y
Start tracking "../product_projective/morphism.py"? [yes/No] y
Start tracking "../product_projective/point.py"? [yes/No] y
Start tracking "../product_projective/space.py"? [yes/No] y
Start tracking "../../structure/graphics_file.py"? [yes/No] y
Commit your changes to branch "ticket/17067"? [Yes/no] yes
# Use "sage --dev push" to push your commits to the trac server once you
are done.
$ git merge master
Auto-merging src/sage/schemes/projective/projective_point.py
CONFLICT (content): Merge conflict in
src/sage/schemes/projective/projective_point.py
}}}
On Sunday, January 25, 2015 at 10:47:07 AM UTC-5, Volker Braun wrote:
>
> If you try to merge a commit that is already in your branch history then
> git will do nothing (it'll say: Already up-to-date). So you are not doing
> what you think you are doing at one point. Post the commands that you are
> using with their full output.
>
>
>
>
> On Sunday, January 25, 2015 at 4:08:27 PM UTC+1, Ben Hutz wrote:
>>
>> I'm working on #17067 to fix a merge conflict. I have fixed a number of
>> merge conflicts in the past with no issues, but every once in awhile I run
>> into the issues I'm having with 17067. I figured it is time to figure out
>> what I'm doing wrong here.
>>
>> - I merge in the lastest beta to my ticket
>> - use meld to resolve merge conflicts
>> - commit the changes
>>
>> There is now still a merge conflict!! My local branch has the beta merged
>> in and everything works great. However, somehow there are still conflicts
>> if I try to merge in the exact same master branch again. Clearly I'm doing
>> something wrong here. Here is what I do specifically.
>>
>> - git merge the beta into my ticket branch
>> - run meld through git mergetool
>> - grab everything appropriate form the left/right columns into the
>> center to get what I'm supposed to have
>> - if necessary, manually edit the center column to get the correct merge
>> - save and exit
>>
>> I think the issue occurs when I can't quite use the automatically
>> generated blocks and I have to manually edit the center column (this is
>> what is happening with 17067). Is this wrong? If so, how am I supposed to
>> deal with the cases where the auto-generated blocks aren't quite right? Or,
>> is this a red herring and I'm doing something else weird?
>>
>> Thanks,
>> Ben
>>
>
--
You received this message because you are subscribed to the Google Groups
"sage-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.
