Mark conflicting files as resolved in Git

After you've manually resolved a Git merge conflict, you have to mark the resulting file as "resolved" (notion from other DVCSs). Just do this to achieve this:

git add your_file_with_manually_resolved_conflicts.txt

Comments

Post a Comment

Popular posts from this blog

Tuning ext4 for performance with emphasis on SSD usage

The obligatory disclaimer: The more performance you gain, the more data integrity you loose! But if you want to tune something like a file system, I strongly assume that you know what you are doing :) These tips apply to all major Linux distributions like Fedora/Red Hat, OpenSUSE, and Ubuntu that are already using ext4 or are going to make ext4 their default file system. As write operations on Solid State Disks (SSD) are expensive the tips below are focused on SSD usage but also apply to HDD usage as well . My Ubuntu 9.04 Jaunty /etc/fstab after a fresh installation: [...] UUID=d818ddf9-ff01-e21a-a67d-3ceab43a9e2b / ext4 relatime,errors=remount-ro 0 1 UUID=0d339122-74e0-e0ea-805a-7879b1fa3172 /home ext4 relatime 0 2 [...] My tuned Ubuntu 9.04 Jaunty /etc/fstab : [...] UUID=d818ddf9-ff01-e21a-a67d-3ceab43a9e2b / ext4 noatime,barrier=0,nobh,commit=100,nouser_xattr 0 1 UUID=0d339122-74e0-e0ea-805a-7879b1fa3172 /home ext4 noatime,barrier=0,data=writeback,nobh,commit=100,nouser_xattr 0 2
Read more

NetBeans 6.1: Working with Google´s Android SDK, Groovy and Grails

Image
For a beta release NetBeans 6.1 is surprisingly stable and mature but not mature enough to start any new project from scratch as the project configuration files are not modified as intended yet. Everybody who has ever tried the SWT- based Eclipse IDE under Linux, knows how bad usability, system integration and quality assurance can be and will therefore appreciate the Swing widget toolkit based NetBeans as an alternative IDE to Eclipse . However Swing is also not the best GUI toolkit under Linux but definitely better than SWT! As you can see on the image bellow, you can also get Groovy (Java-based scripting language developed to fulfill RAD requirements) support in NetBeans 6.1 by downloading a correspondent plugin: Grails framework (the Groovy analogon to Ruby on Rails) and Google´s Android SDK support are available via plugin as well. There is also a NetBeans 6.0.x DEB package for Ubuntu available, if you add the following line to your "/etc/apt/sources.list&q
Read more