Git rebase without conflicts

If you worked on a branch and have difficulties to rebase it from another branch (like master), you can you use Git automatic conflicts resolution strategy which prioritize files in conflict from your branch or from the branch you need to rebase from.

So, let's go. Consider you're on your branch (git checkout my_branch). You have a local branch 'master' you want to rebase from because master is up-to-date  and you want to retrieve last bug fxes and features from it.

If you want to prioritize your files in case of conflict, do :
git rebase master -Xtheirs

If you want to prioritize files from 'master' branch in case of conflict, do :
git rebase master -Xours

Hope this helps!

Reduce PDF size

You have a very large PDF file with high definition photos. It could be difficult to host on a server. So, to reduce its weight (and its quality of course), you can use ghostscript like this :

gs -sDEVICE=pdfwrite -dCompatibilityLevel=1.6 -dPDFSETTINGS=/screen -dNOPAUSE -dQUIET -dBATCH -sOutputFile=output.pdf input.pdf

Of course this suppose you use Linux. 

Enjoy!

A great post on REST API

http://www.thedevpiece.com/the-basic-you-should-know-before-building-your-rest-api/

Enjoy!

How to force java path in subscript (nested script call)

If you use a script that runs another script which starts a java virtual machine, you should need to specify which java command you want to use from the first script. Consider the following example :

startup.sh  --->  application.sh --> java command

I can modify startup.sh but not application.sh which calls java command. But I need a specify version a java.

So, I tried to solve this problem with :

• linux 'source' command ... BAD!!!
• linux 'alias' command... BAD!!!

But, I finally got a working solution by redefining a  'java' function before calling application.sh. GOT IT! When application.sh calls 'java', it invokes my function. Like this :

java() {

    /specificpath/jdk/bin/java "$@"

}

export -f java

sh ./application.sh

Enjoy!

Don't merge on Git

That's something I learnt. When use grab code from server, if you use 'git pull', it makes behind the scene two command 'git fetch' + 'git merge'.

Merge is bad because it doesn't respect commits order. So, you should prefer 'git rebase' which re-apply your commits to the code you just fetched. To do 'git fetch' + 'git rebase', you can make a 'git pull --rebase'. But, if you afraid to forget the rebase option, you can setup your git to do it by default with the following command :

git config --global pull.rebase true

Source : https://coderwall.com/p/tnoiug/rebase-by-default-when-doing-git-pull

roguelike tutorial 00: The table of contents

People seem to like my roguelike tutorial!

For those who want to try making your own roguelike in java, here's the links to each of the 20 posts in my little tutorial I did a few years ago. I try to take it one small step at a time, explain why I'm doing what I'm doing, teach a bit of programming, and move forward with each post.

01 Java, Eclipse, AsciiPanel, application, applet

02 input, output, modes, and screens

03 scrolling through random caves

04 the player

05 stationary monsters

06 hitpoints, combat, and messages

07 z levels and deeper caves

08 vision, line of sight, and field of view

09 wandering monsters

10 items, inventory, inventory screens

11 hunger and food

12 weapons and armor

13 aggressive monsters

14 experience and leveling up

15 help, examine, and look screens

16 throwing and ranged weapons

17 smarter monsters

18 potions and effects

19 mana, spells, and magic books

20 item appearance and identification

And, because it's always a good idea to pause and reflect:

roguelike tutorial retrospective

When you make something cool, or even come up with a neat idea, let us know on /r/roguelikedev/!

Windows 10 upgrade stucks on Downloading Updates

That's what I had on my laptop. If you have the same issue, open a terminal as administrator and execute the following command to stop "Windows Update Service". You should see your installation continuing.

net stop wuauserv