The git merge approach is as follows:
git checkout <branch_name_into_which_you_want_to_merge>
git merge --squash <branch_name_to_be_squashed>| package test; | |
| public class Test { | |
| String s = // 10,000 chars long string | |
| String substr = s.substring(1); | |
| } |
| public class JAXBMarshallerUnmarshaller { | |
| public SomeJaxbResponse unmarshal() throws JAXBException, FileNotFoundException { | |
| final JAXBContext context = JAXBContext.newInstance(SomeJaxbResponse.class); | |
| return (SomeJaxbResponse) context.createUnmarshaller() | |
| .unmarshal(new FileReader("./someEndpointResponse.xml")); | |
| } | |
| public void marshal() throws JAXBException { | |
| final SomeJaxbResponse someJaxbResponse = new SomeJaxbResponse(); | |
| final OutputRoot outputRoot = new OutputRoot(); |
| public class Demo { | |
| public final static String resourceURI = "classpath:/file_info.html"; | |
| public final static String EMPTY_STRING = ""; | |
| @Autowired | |
| private ResourceLoader resourceLoader; | |
| public String getSpringResource(final String resourceURI) { |
| git branch -m old_branch new_branch # Rename branch locally | |
| git push origin :old_branch # Delete the old branch | |
| git push --set-upstream origin new_branch # Push the new branch, set local branch to track the new remote |