An hour ago, I pulled recent commits to my local repository. I edited a couple of files, wrote commit messages, and pulled again, nothing new. I then did the usual: commit 2.7, commit 3.4, merge to 3.5. Problem: merge conflicts from 6 files I have never touched. Include/patchlevel.h Lib/distutils/__init__.py Lib/idlelib/idlever.py Lib/pydoc_data/topics.py Misc/RPM/python-3.5.spec README I stopped at this point and ran diskcheck. I then looked at the DAG and noticed 5 previous 3.4 patches that were not merged into 3.5: rev 90750 and 90751, Larry Hastings, 2 weeks ago!, rev 90752 and 90753 by Larry a day ago, and 90755 by Raymond Hettinger 8 hours ago. From earliest to lastest: c67a19e11a71 7c5f1b200a24 35ea333f43bd 31211947387b 854fd6eeee2f If there was any notice on the Committer's list about not making commits, I did not get it. In fact, I do not remember getting anything on that list for at about a month. Besides that, I had no problem 3 days ago, and noticed the commit by Raymond, though not the absence of a merge. In any case, what do I do now, short of deleting and re-cloning, so I do not make anything worse? -- Terry Jan Reedy
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4