ModelAndView mv=new ModelAndView("hola");

Question

Hice una actualización de svn que generó conflictos.

Ahora quiero obtener mi copia de trabajo.

Entonces, ¿alguien me puede decir cómo deshacer la actualización de svn?

esta es mi clase de controlador con conflictos

registrador estático final Logger = Logger.getLogger(ChromeExtentionController.class); <<<<<<< .mío

private static final String HttpServletRequest = null;

@RequestMapping(value = "/lead/test", method = RequestMethod.GET)
public String welcome() {

    // return new ModelAndView("redirect:/hello");
    ModelAndView mv = new ModelAndView("hello");

||||||| .r8587

@RequestMapping(value="/lead/test",method=RequestMethod.GET)
public String welcome(){

    //return new ModelAndView("redirect:/hello");

ModelAndView mv=new ModelAndView("hola");

CustomJMSProducer producer=new CustomJMSProducer();

@RequestMapping(value="/lead/test",method=RequestMethod.GET)
public String welcome(){

    //return new ModelAndView("redirect:/hello");
    ModelAndView mv=new ModelAndView("hello");

.r9063 mv.addObject("Mensaje", "Éxito"); System.out.println("Mi cadena " + mv.toString()); devolver "éxito";

}

@RequestMapping(value = "/scraper/submit1", method = RequestMethod.GET)
public String postDataForChromeExtension1() {
    CustomJMSProducer c = new CustomJMSProducer();
    // c.messageToQueue();
    return "Success";

}

<<<<<<< .mío

@RequestMapping(value = "/scraper/submit", method = RequestMethod.POST)

public String postDataForChromeExtension(@RequestBody String scraperInput) {
    if (scraperInput == null || scraperInput.isEmpty()) {
        logger.info("Null in request body");
        System.out.println("Null in request body");
        return "NULL BODY";
    } else {

        CustomJMSProducer c = new CustomJMSProducer();
        ObjectMapper mapper = new ObjectMapper();
        Map incomingRequest = null;
        String url = null;

||||||| .r8587

@RequestMapping(value="/scraper/submit",method = RequestMethod.POST)
public String postDataForChromeExtension(@RequestBody String scraperInput){
    if(scraperInput==null || scraperInput.isEmpty()){
        logger.info("Null in request body");
        System.out.println("Null in request body");
        return "NULL BODY";
    }else{

    CustomJMSProducer c=new CustomJMSProducer();
    ObjectMapper mapper = new ObjectMapper();
    Map incomingRequest=null;
    String url=null;

intentar {

@RequestMapping(value="/scraper/submit",method = RequestMethod.POST)
public String postDataForChromeExtension(@RequestBody String scraperInput){


    try {

.r9063 <<<<<<< .mine intentar { intentar { incomingRequest = mapper.readValue (scraperInput, Map.class); url = incomingRequest.get("url")! = nulo? incomingRequest.get("url").toString() : ""; } catch (Excepción e) { logger.info("Error al asignar al mapa" + e.getMessage()); logger.error("Error al asignar al mapa" + e.getMessage()); }

            c.messageToQueue(scraperInput, url);
        } catch (Exception e) {
            logger.error("Error while sending HTML to queue" + e.getMessage());
            return "error";
        }

        return "OK";

||||||| .r8587 intente { incomingRequest = mapper.readValue(scraperInput, Map.class); url = incomingRequest.get("url")! = nulo? incomingRequest.get("url").toString() : ""; } catch (Excepción e) { logger.info("Error al asignar al mapa"+e.getMessage()); logger.error("Error al asignar al mapa"+e.getMessage()); }

        c.messageToQueue(scraperInput,url);
    } catch (Exception e) {
        logger.error("Error while sending HTML to queue"+e.getMessage());

devolver "error";

        producer.send(scraperInput);
        return "OK";
    } catch (Exception e) {
        logger.error("Error while sending HTML to queue"+e.getMessage());
        return "error";

.r9063 } }

    @RequestMapping(value = "/abc", method = RequestMethod.GET)
    public ModelAndView getData() {

        ModelAndView model = new ModelAndView("hello");

<<<<<<< .modelo de retorno mío;

    }

||||||| .r8587 devuelve "OK";

}

.r9063