5 de noviembre de 2013

List merge conflicts with GIT

Made a merge, particularly, a big one and you want to know which where the files that had conflicts?

Then, this command might come handy:

You can also make a GIT alias this way:

and then use it like this:

No hay comentarios: