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!
My chromebook is fantastic! As it supports Linux integration feature, I can open a terminal and install every Debian based packages I want ...
I've just received my first arduino platform. It's a DCcduino board (a clone of Arduino Uno). As I had some difficulties to hav...
I'm an old user and addict of JRebel. I started to use it on open source projects and in professional contexts. From the beginning, I...
Programmers know that blogger doesn't support code insertion (usefull if you need to demonstrate how to program something by copy/pastin...