search

erlanglab / erlangpl

Tool for developers working with systems running on the Erlang VM (BEAM). It helps with performance analysis.
http://www.erlang.pl/
Apache License 2.0
549 stars 40 forks source link

Merge epl_st as in-umbrella application #46

Closed baransu closed 7 years ago

baransu commented 7 years ago 
$ git remote add -f epl_st https://github.com/erlanglab/epl_st.git
$ git merge -s ours --no-commit --allow-unrelated-histories epl_st/master
$ git read-tree --prefix=apps/epl_st/ -u epl_st/master
$ git commit -m "Merge epl_st subdirectory"
$ git pull -s subtree epl_st master

There is flag --allow-unrelated-histories we have to pass to merge unrelated histories.

arkgil commented 7 years ago

Thanks, the flag is what I've missed 👍

arkgil commented 7 years ago

Aand it's ready :) @Baransu shall we merge?

baransu commented 7 years ago

Let's do it!