search

seahorn / sea-dsa

A new context, field, and array-sensitive heap analysis for LLVM bitcode based on DSA.
Other
157 stars 29 forks source link

Added pass to color graphs #48

Closed igcontreras closed 4 years ago

agurfinkel commented 5 years ago

seems like this branch is in conflict with master. Maybe @caballa changed something while the PR is still outstanding. None the less, you should rebase the PR against master before we can merge it.

caballa commented 5 years ago

I wouldn't merge with master yet.

agurfinkel commented 5 years ago

Sorry, I did not imply that I am trying to merge. I'm just pointing out that there is a conflict and that resolving this conflict early is usually easier than waiting until the PR is ready to be merged.

igcontreras commented 5 years ago

Sorry I didn't see these messages, is the conflict still there? I fixed one

agurfinkel commented 5 years ago

unless you forced pushed, it would not be resolved. It still says This branch cannot be rebased right above where I type this message

igcontreras commented 5 years ago

To me it says "This branch has no conflicts with the base branch". I think that I am checking against master

agurfinkel commented 5 years ago
Screen Shot 2019-10-01 at 13 00 43

this what I see in the web browser in the PR. It would be strange if you see something different since the page is not generated personally for me :)

igcontreras commented 5 years ago

Something weird is happening because I see this: Screen Shot 2019-10-01 at 10 19 36

agurfinkel commented 5 years ago

cute :) I'll check manually when I have time and will ignore this message for now