# Merge
**URL:** https://community.zeek.org/t/merge/1723
**Category:** Development
**Tags:** development
**Created:** [November 25, 2010, 12:17am UTC](https://community.zeek.org/t/merge/1723 "2010-11-25T00:17:55Z")
**Posts on this page:** 8
**Page:** 1
### Author:  [@robin](https://community.zeek.org/u/robin)
#### Post date: [November 25, 2010, 12:17am UTC](https://community.zeek.org/t/merge/1723/1 "2010-11-25T00:17:55Z")
Jon,
can I already go ahead and merge the cmake-port branches over to
their masters?
Robin
---
### Author:  [@Jonathan\_Siwek](https://community.zeek.org/u/Jonathan_Siwek)
#### Post date: [November 25, 2010, 12:36am UTC](https://community.zeek.org/t/merge/1723/2 "2010-11-25T00:36:12Z")
> can I already go ahead and merge the cmake-port branches over to
> their masters?
I'm cool with it.
I was too preoccupied/distracted this week to organize git/CMake documentation and port my task notes over to tracker, but I can finish that later and it doesn't block the merge from happening (unless you say it does).
- Jon
---
### Author:  [@robin](https://community.zeek.org/u/robin)
#### Post date: [November 25, 2010, 5:17am UTC](https://community.zeek.org/t/merge/1723/3 "2010-11-25T05:17:23Z")
That's fine. Ok, I'll go ahead then.
Note to all: this may make the masters unstable for a bit until I
get everything into the right shape.
Robin
---
### Author:  [@robin](https://community.zeek.org/u/robin)
#### Post date: [November 25, 2010, 5:50am UTC](https://community.zeek.org/t/merge/1723/4 "2010-11-25T05:50:27Z")
Ok, done; all cmake-ports are merged in. For a quick test, it seems
work ok (except for the spamming ...). But I'll do some more testing
later. I haven't deleted the topic branches yet.
Robin
---
### Author:  [@Adam\_J\_Slagell](https://community.zeek.org/u/Adam_J_Slagell)
#### Post date: [November 25, 2010, 5:54am UTC](https://community.zeek.org/t/merge/1723/5 "2010-11-25T05:54:45Z")
Laying in bed with son.
3 year old listening to dualing ipad & iPhone emails: what's that daddy?
Me: sounds like a git merge
Son: no. That's silly.
---
### Author:  [@Gregor\_Maier](https://community.zeek.org/u/Gregor_Maier)
#### Post date: [November 27, 2010, 6:16pm UTC](https://community.zeek.org/t/merge/1723/6 "2010-11-27T18:16:39Z")
bro master still contains the autoconf-related files (configure.in,
Makefile.am, autogen.sh, etc.). Those should probably also be deleted
once you are done.
cu
gregor
---
### Author:  [@robin](https://community.zeek.org/u/robin)
#### Post date: [November 27, 2010, 6:31pm UTC](https://community.zeek.org/t/merge/1723/7 "2010-11-27T18:31:05Z")
Yes, I'm working on cleanup branches for all the repos, removing
this and other stuff we don't need anymore (like BroLite, yeah! 🙂
Robin
---
### Author:  [@system](https://community.zeek.org/u/system)
#### Post date: [May 6, 2022, 3:39pm UTC](https://community.zeek.org/t/merge/1723/8 "2022-05-06T15:39:16Z")