![]() ![]() I tried to resolve these conflicts using the mergetool gitignore files that were not tracked to try to isolate any behavior that may be happening and not consistent between branches. I did a "git reset -hard HEAD" before the rebase, no help.Cloned another copy of the repo and confirmed I have never commited anything and that these conflict files do not exist.Confirmed that I never commited anything on the local master branch and that these conflict files do not exist.Git version 2.9.3 Things I have tried (that did not work or help) There are basically 4 files out of about 100 that I have added that continually get conflicts and during rebase they want to be merged again and again with the same diff over and over and over. I had never merged anything back to to the local or the remote. Git rebase master mybranch (conflicts in files that do not exist on master) git pull -rebase (on master branch and successfully) Get some merge conflicts on files that do not exist on the remote or local master branch. I was only adding new files and this worked great until up until a few weeks ago when I started to ![]() Local master -o-o o-o-o-o rebase master to mybranch fails \ \ (pull -rebase) \(pull -rebase (successful) Which looks something like: master -o-o-o-o-o-o-o I cloned a remote repository and have been keeping it up to date with git pull -rebase, then rebasing that local master into a local branch: git pull -rebase (on master) I have read many questions on SO and many articles but nothing I have found seems to address an issue quite like this. The brief summary is that there are conflicts on files where there should not possibly be conflicts. I have a maddening little git rebase issue going on right now. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |