GIT Merges

Learning GIT is fun!

When you want to merge and cannot do a fast forward from a remote getting CONFLICTS are inevitable. First off, if you ever mess anything up you can always

git reset --merge ORIG_HEAD

This will set you back to before the merge attempt.

When you do get a conflict, fix the file and then commit with -i like so:

git commit -i myfile.java

This will stage the file first.