search

angr / tracer

Utilities for generating dynamic traces
BSD 2-Clause "Simplified" License
88 stars 28 forks source link

Merging tracer into angr as an otie #45

Closed tyb0807 closed 6 years ago

tyb0807 commented 6 years ago

So all other stuff except tracer core logic should stay here (at least atm). I don't know if a compat layer is necessary, since the tracer otie maybe quite different than the original tracer. Please let me know what you think @rhelmot @zardus @salls @ltfish.

Many thanks

tyb0807 commented 6 years ago

@zardus How can I resolve the conflicts? I know that the version on my branch is the right one?

zardus commented 6 years ago

I told you we shouldn't have merged anything in the meantime :-)

The easiest thing with changes of this magnitude is to backup the repo, check out a fresh version, and re-do your changes (you can just blow away everything in the new repo and copy your stuff over). It's absolutely the git-n00b thing to do, but it'll be the easiest way to do it.