# \#861: Merging DNP3 Analyzer

**URL:** <https://community.zeek.org/t/861-merging-dnp3-analyzer/2448>\
**Category:** Development\
**Tags:** development\
**Created:** [September 28, 2012, 3:08pm UTC](https://community.zeek.org/t/861-merging-dnp3-analyzer/2448 "2012-09-28T15:08:22Z")\
**Posts on this page:** 3\
**Page:** 1

<div class="post-metadata">

**Author:** ![Hui\_Lin](https://avatars.discourse-cdn.com/v4/letter/h/13edae/32.png) [@Hui\_Lin](https://community.zeek.org/u/Hui_Lin)\
**Post date:** [September 28, 2012, 3:08pm UTC](https://community.zeek.org/t/861-merging-dnp3-analyzer/2448/1 "2012-09-28T15:08:22Z")

</div>

Hi, Robin,

I think your TODO-hui is included in the branch topic/robin/dnp3-merge. But when I checkout the branch, git gives me this errors:

“error: Entry ‘aux/broctl’ would be overwritten by merge. Cannot merge.”

Seems not safe. Any opinion what should I do.

Hui

---

<div class="post-metadata">

**Author:** ![robin](https://yyz1.discourse-cdn.com/flex011/user_avatar/community.zeek.org/robin/32/599_2.png) [@robin](https://community.zeek.org/u/robin)\
**Post date:** [September 28, 2012, 3:15pm UTC](https://community.zeek.org/t/861-merging-dnp3-analyzer/2448/2 "2012-09-28T15:15:12Z")

</div>

> when I checkout the branch, git gives me this errors:
> 
> "error: Entry 'aux/broctl' would be overwritten by merge. Cannot  
> merge."

What command are you using? That sounds like a merge rather than  
checkout? Try switching to master first (if you haven't already and  
then "git checkout topic/robin/dnp3-merge").

> \> - Does DNP3 have cases similar to Modbus where it would make sense to pass  
> \> arrays of integers (or other elements)? If so, that would be good to do  
> \> (but I don't know the protocol enough to say more).

You can hold off on this for now, Seth has been doing some  
restructuring of the Modbus events and may have thoughts for DNP3 as  
well.

Robin

---

<div class="post-metadata">

**Author:** ![system](https://canada1.discourse-cdn.com/flex011/uploads/zeek/original/1X/f09d732bc2cc7c7cc7e35db67cf4e1d5233ce7a7.png) [@system](https://community.zeek.org/u/system)\
**Post date:** [May 6, 2022, 3:40pm UTC](https://community.zeek.org/t/861-merging-dnp3-analyzer/2448/3 "2022-05-06T15:40:35Z")

</div>