SVN Something to do when CONFLICT appear. 

  (p)  postpone    - mark the conflict to be resolved later
 (df) diff-full   - show all changes made to merged file
 (e)  edit        - change merged file in an editor
 (r)  resolved    - accept merged version of file
 (mf) mine-full   - accept my version of entire file (ignore their changes)
 (tf) theirs-full - accept their version of entire file (lose my changes)
 (l)  launch      - launch external tool to resolve conflict
 (h)  help        - show this list

Comments

Post a Comment

Popular posts from this blog

Changing postgres password and warning

ORIGINAL from https://serverfault.com/questions/110154/whats-the-default-superuser-username-password-for-postgres-after-a-new-install CAUTION  The answer about changing the UNIX password for "postgres" through "$ sudo passwd postgres" is not preferred, and can even be  DANGEROUS ! This is why: By default, the UNIX account "postgres" is locked, which means it cannot be logged in using a password. If you use "sudo passwd postgres", the account is immediately unlocked. Worse, if you set the password to something weak, like "postgres", then you are exposed to a great security danger. For example, there are a number of bots out there trying the username/password combo "postgres/postgres" to log into your UNIX system. What you should do is follow  Chris James 's answer: sudo -u postgres psql postgres # \password postgres Enter new password: To explain it a little bit. There are usually two default ways to login to
Read more
Hi Everyone :) I just beginning new post in new year with Xubuntu fresh installed on X260. A bit of problems around. This post will relate to one problem I found recently. Problem:   I cannot bring bring `brightness` back after return from suspend. Summarize solutions:   1.1. Create this file by command `sudo touch /usr/share/X11/xorg.conf.d/20-intel.conf`   1.2. Add this to file Section "Device"         Identifier  "card0"         Driver      "intel"         Option      "Backlight"  "intel_backlight"         BusID       "PCI:0:2:0" EndSection   1.3. Restart or may be logout and login   2.1. Edit this file by command `sudo vi /etc/default/grub`   2.2. Modify previous to with this GRUB_CMDLINE_LINUX_DEFAULT="quiet splash acpi_osi=Linux apci_backlight=vendor"   2.3. We should restart, i guess Finally, I still don't know if it work, but hey, right now it's fine for me
Read more