Yes, it does appear to resolve the merge conflict when done this way. The
only difference was using
git commit
instead of committing via the dev scripts (sage -dev commit). It's nice to
know it wasn't me not understanding the conflict resolution process, but
some issue with the script.
On Sun
Yes, my master does have the lastest develop on it. There is a ticket
closed between beta5 and beta6 that conflicts with 17067. So the old master
merges fine in any case.
OK. I'll reset and commit via git and see if that fixes the issue.
btw, the 'sagetest -dev commit' is doing the commit via t
Just to be clear, reset master *after* checking it out:
git checkout master
git fetch trac master
git reset --hard FETCH_HEAD
On Sunday, January 25, 2015 at 6:01:04 PM UTC+1, Volker Braun wrote:
>
> old or unrelated to our master branch. You should first update/reset it:
>
> git fetch trac maste
I don't know what "sagetest -dev commit" does but if it produced the branch
that you pushed to 17067 then you should never use it again as that is
seriously messed up.
Also, your branch merges automatically with the current master. It seems
that your local copy of "master" is old or unrelated t
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):
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
