Are you expending too much?. Probably you want to cut down your expenses and reduce the budget expenditure.
The easy targets, things that have “free” replicas, or that you can discard (that IDE you’re used to, the new computer, the Git UI, etc…). Bad Idea!!!
For instance, if you are a software engineer/graphic designer/”put a computer intensive profession here” you may think of buying that refurbished computer and spare yourself 200 dollars. But, remember that you will be using that computer almost all day long. Do you really want to save a marginal amount of money and take the risk of a “shorter lifespan” (my own experience with refurbished hardware being not very good… hello apple/dell).
Another example may concern software. You find a tool (probably open source) that for free does what you need but has a stepper learning curve, no support, and longer configuration time. On the other hand you have another tool that will cost you real money, but it’s simpler to use (or you just know how to use it well). You save the money, but probably slow yourself down… less productive.
So, if you need to decide whether to spend those 2K dollars (or euros) in a brand new macbook pro (or other computer), buy a very intuitive IDE, or productive solution. I advice to go for it, and save the money on other (less important) things (for example less coffee/soda/snacks).
Note 1: I have nothing against open source. I think open source software is just great, but sometimes commercial solutions turn out to be just more productive.
Note 2: This applies when you have the money and you want to save it. If you don’t have the money, just go for the cheap solution.
Using git and pulling/pushing changes & rebase —
git checkout -b MERGEand try to merge with the master….
git merge MERGE mastermerge successful, then
git checkout masterthen pull
gitand then the same rebase problem :S… Panic!!!!
git add YOUR_FILES
git rebase --continue
Love this video: Did You Know? Invest in France Agency (by InvestinFranceAgency)