Joined April 2013
·

Rafael

Pachuca, Mexico
·
·

Thanks for the info, it was useful!

Just for reference, I ran into a conflict when trying to merge a branch
into master. The Emacs frame where one has to type 'e' is the
one that contains the buffer magit: <thefilename>, not the
branch manager. The buffer where one has to type 'a' or 'b' is
the small one that pops up. And I had to stage and commit before
I could continue merging.

Achievements
59 Karma
0 Total ProTip Views