Skip to content

Instantly share code, notes, and snippets.

@watsoncj watsoncj/gist:983656
Created May 20, 2011

Embed
What would you like to do?
strange cherry-pick behavior
$ git show a1e938c -- $RES
commit a1e938c7616dc1b1bbda22f1a0fff3396b86def0
Author: dude <dude@somewhere.com>
Date: Fri May 20 12:30:59 2011 -0600
WATSON-4352 added screens to configure revenue property data
diff --git a/src/java/com/unifocus/watson/resources/WatsonResources.properties b/src/java/com/unifocus/watson/resources/WatsonResources.properties
index 08f7623..db41fe3 100644
--- a/src/java/com/unifocus/watson/resources/WatsonResources.properties
+++ b/src/java/com/unifocus/watson/resources/WatsonResources.properties
@@ -4370,4 +4370,16 @@ res_datePaidMustExistError=You must enter a valid date for the date the earning
res_datePaidMustBeOnOrAfterError=The date paid must be on or after the date the earning was incurred
res_payDateChangedFromTo=Pay Date changed from {0} to {1}
res_dateToPay=Date To Pay
-res_toBeDetermined=TBD
\ No newline at end of file
+res_toBeDetermined=TBD
+res_incomeJournalMethodLbl=Income Journal Method:
+res_miscTypeJournalEntryMethodLbl=Misc. Type Journal Entry Method:
+res_calculateAdrAndOccPercentUsingLbl=Calculate ADR and OCC % using:
+res_excludeOutOfServiceRoomsFromInventoryLbl=Exclude out of service Rooms from Inventory:
+res_kbiOrBudgetForRoomsCalculationLbl=KBI or Budget for Rooms Calculation:
+res_budgetLbl=Budget:
+res_useKbi=Use KBI
+res_useBudget=Use Budget
+res_roomsOccupied=Rooms Occupied
+res_roomsSold=Rooms Sold
+res_editPropertyRevenue=Edit Property Revenue
+res_globalDataVarLbl=Global Data: {0}
$ git cherry-pick a1e938c
error: could not apply a1e938c... WATSON-4352 added screens to configure revenue property data
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit -c a1e938c
$ cat src/java/com/unifocus/watson/resources/WatsonResources.properties
...sippet...
res_editByUnits=Edit By Units
res_totalsWithParameter={0} Totals
<<<<<<< HEAD
res_postIncomeJournal=Post Income Journal
=======
res_balanceAsOfDateLbl=Balance as of {0}:
res_balanceEstAsOfDateLbl=Est. Balance as of {0}:
res_lieuExpiringLbl=Lieu Expiring:
...whole bunch of other shit not in the original a1e938c commit...
res_payDateChangedFromTo=Pay Date changed from {0} to {1}
res_dateToPay=Date To Pay
res_toBeDetermined=TBD
res_incomeJournalMethodLbl=Income Journal Method:
res_miscTypeJournalEntryMethodLbl=Misc. Type Journal Entry Method:
res_calculateAdrAndOccPercentUsingLbl=Calculate ADR and OCC % using:
res_excludeOutOfServiceRoomsFromInventoryLbl=Exclude out of service Rooms from Inventory:
res_kbiOrBudgetForRoomsCalculationLbl=KBI or Budget for Rooms Calculation:
res_budgetLbl=Budget:
res_useKbi=Use KBI
res_useBudget=Use Budget
res_roomsOccupied=Rooms Occupied
res_roomsSold=Rooms Sold
res_editPropertyRevenue=Edit Property Revenue
res_globalDataVarLbl=Global Data: {0}
>>>>>>> a1e938c... WATSON-4352 added screens to configure revenue property data
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.