git revert -m 1 <merge-commit>
With ‘-m 1’ we tell git to revert to the first parent of the mergecommit on the master branch. -m 2 would specify to revert to the first parent on the develop branch where the merge came from initially
(lieber vorher prüfen welcher branch welcher ist)
Subversion 1.5 will support Merge Tracking. This blog post provides a high level overview of what Merge Tracking is, why it is important and what it means to your organization.
PDFtk Server is our command-line tool for working with PDFs. It is commonly used for client-side scripting or server-side processing of PDFs. It is also used by OEMs and ISVs to give their products the ability to manipulate PDFs. A commercial license is required to distribute PDFtk with your commercial product.
If PDF is electronic paper, then pdftk is an electronic staple-remover, hole-punch, binder, secret-decoder-ring, and X-Ray-glasses. Pdftk is a simple tool for doing everyday things with PDF documents.
M. Hern&\#225;ndez, and S. Stolfo. SIGMOD '95: Proceedings of the 1995 ACM SIGMOD international conference on Management of data, page 127--138. New York, NY, USA, ACM Press, (1995)
S. Nejati, M. Sabetzadeh, M. Chechik, S. Easterbrook, and P. Zave. (May 2007)Model Management addresses the problem of managing
an evolving collection of models, by capturing the relationships
between models and providing well-defined operators
to manipulate them. In this paper, we describe two
such operators for manipulating hierarchical Statecharts:
Match, for finding correspondences between models, and
Merge, for combining models with respect to known correspondences
between them. Our Match operator is heuristic,
making use of both static and behavioural properties
of the models to improve the accuracy of matching. Our
Merge operator preserves the hierarchical structure of the
input models, and handles differences in behaviour through
parameterization. In this way, we automatically construct
merges that preserve the semantics of Statecharts models.
We illustrate and evaluate our work by applying our operators
to AT&T telecommunication features..
H. chih Yang, A. Dasdan, R. Hsiao, and D. Parker. SIGMOD '07: Proceedings of the 2007 ACM SIGMOD international conference on Management of data, page 1029--1040. New York, NY, USA, ACM, (2007)
G. Stumme, and A. Maedche. IJCAI-2001 -- Proceedings of the 17th International Joint Conference on Artificial Intelligence, Seattle, USA, August, 1-6, 2001, page 225--234. San Francisco, Morgen Kaufmann, (2001)