Zerocools-MacBook:openmrs-core pamusriharsha$ git pull --rebase upstream master
remote: Counting objects: 1387, done.
remote: Compressing objects: 100% (553/553), done.
remote: Total 1129 (delta 544), reused 960 (delta 409)
Receiving objects: 100% (1129/1129), 229.69 KiB | 142 KiB/s, done.
Resolving deltas: 100% (544/544), completed with 134 local objects.
From https://github.com/openmrs/openmrs-core
 * branch            master     -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: TRUNK-3876: Fix things
Using index info to reconstruct a base tree...
<stdin>:33: trailing whitespace.
		try {
<stdin>:34: trailing whitespace.
			data = serializer.serialize(object);
<stdin>:35: trailing whitespace.
		}
<stdin>:36: trailing whitespace.
		catch (SerializationException e) {
<stdin>:37: trailing whitespace.
			throw new DAOException("Unable to save object <" + object + "> because serialization failed.", e);
warning: squelched 10 whitespace errors
warning: 15 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Applying: Other changes
Using index info to reconstruct a base tree...
<stdin>:16: trailing whitespace.
				throw new HL7Exception(
<stdin>:17: trailing whitespace.
				        "Check to ensure that the form's OBS section is a concept field. Invalid OBR in hl7 message with uid: "
<stdin>:18: trailing whitespace.
				                + messageControlId);
warning: 3 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging web/src/main/java/org/openmrs/web/controller/PersonRelationshipsPortletController.java
CONFLICT (content): Merge conflict in web/src/main/java/org/openmrs/web/controller/PersonRelationshipsPortletController.java
Auto-merging api/src/main/java/org/openmrs/notification/NoteService.java
CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/notification/NoteService.java
Failed to merge in the changes.
Patch failed at 0002 Other changes

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".