Como trabalhar copiando depois do svn update

Question

Eu fiz o svn update que deu origem a conflitos.

Agora eu quero pegar minha cópia de trabalho

então, por favor, alguém me diga como desfazer o svn update

esta é minha classe de controle com conflitos

logger de logger estático final = Logger.getLogger (ChromeExtentionController.class); << < < < < < .min

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 = novo ModelAndView ("olá");

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("Message", "Success"); System.out.println("My string " + mv.toString()); return "success";

          

        

      

    

  

}

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

}

@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;

tente {

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


    try {

.r9063 <<<<<<< .mine try { try { incomingRequest = mapper.readValue(scraperInput, Map.class); url = incomingRequest.get("url") != null ? incomingRequest.get("url").toString() : ""; } catch (Exception e) { logger.info("Error whle mapping to map" + e.getMessage()); logger.error("Error whle mapping to map" + e.getMessage()); }

          

        

      

    

  

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

        return "OK";

||||||| .r8587             experimentar {                 incomingRequest = mapper.readValue (scraperInput, Map.class);                 url = incomingRequest.get ("url")! = null? incomingRequest.get ("url"). toString (): "";             } catch (exceção e) {                 logger.info ("Erro ao mapear para mapear" + e.getMessage ());                 logger.error ("Erro ao mapear para mapear" + e.getMessage ());             }

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

retornar "erro";

        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");

    }

||||||| .r8587         retornar "OK";

}

.r9063