Christoph Thiede

Just was able to reproduce this issue again: > > As a consequence, I keep receiving a broken promise after choosing the already loaded version of conflicts in the merge...

Regarding this issue, I'm still a bit surprised by the `BrokenPromise` error - a more concrete error message would probably have been more helpful. However, I am using an undocumented...

> On which branches is SqueakHistoryData.package present: on master, the feature branch, the stream branch? Not on the master, but on one of the older feature branches, and thus also...

> This was also new to me (maybe we should improve the `#messageText` of `BrokenPromise`). FYIO: Kernel-ct.1408 (inbox) does this. :-)

I experienced the issue again! MessageNotUnderstood: SquotLoadOrderMerge>>artifactAt: from SquotArtifactModification (SquotArtifactDiff) >> #applyToContainer: with anObject container being a SquotLoadOrderMerge (0 conflicts, 0 changes, 0 merges). Here is a bug report: Details29...

Here is a bloody workaround that seemed to work for me (without understanding what's really going on): ```diff applyToContainer: anObjectContainer self hasChanges ifFalse: [ + (anObjectContainer isKindOf: SquotLoadOrderMerge) ifTrue: [^...

Sorry to report that the issue still exists for me. I observe it especially when committing large chunks (e.g., a Form encoded as base64 contents in a method). Luckily, pushing...

I just wanted to create a very similar feature request: After merging + deleting a branch on GitHub, it would be great if Squot would provide a convenient way to...

Note: Maybe something like `git fetch origin master:master` for Squit would also be a helpful addition.

> If it happens again, please tell me what is in the package.st (according to the contents of the FSReference) at this point (in the GitFilesystem of course, not on...