start new:
tmux
start new with session name:
tmux new -s myname
Dimitri De Franciscis megadix
itavero
/ JAXBCollection.java
Last active
March 14, 2023 10:03
Generic serializer / marshaller / unserializer / unmarshaller class to convert objects into strings and vice versa.
Uses the JAXB lib. Personally used this class for converting messages received/sent to a queue (JMS).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| /* | |
| * Copyright (c) 2013, Arno Moonen <info@arnom.nl> | |
| * | |
| * Permission is hereby granted, free of charge, to any person | |
| * obtaining a copy of this software and associated documentation | |
| * files (the "Software"), to deal in the Software without | |
| * restriction, including without limitation the rights to use, copy, | |
| * modify, merge, publish, distribute, sublicense, and/or sell copies | |
| * of the Software, and to permit persons to whom the Software is | |
| * furnished to do so, subject to the following conditions: |
These examples were created during a discussion with j416 on #github about how best to manage long-running feature branches.
The scenario is this: You have a long-running feature branch, based off master. The feature branch and master both touch the same parts of the same files, so you know that there will be conflicts when you finally merge the feature branch in. What can you do to minimise the conflicts?
NewerOlder