GIT pulled from wrong branch
I have two branches on the server A branch called R2 and a branch called
DEV I inadvertently logged into the wrong server, into the repository and
performed a GIT PULL ORIGIN DEV however the repository was on R2. SO I
realized my mistake and then tried to correct my mistake by doing a GIT
PULL ORIGIN R2 However I end up with a bunch of file names and the error
U view/private_api/ipn.phtml
M view/reports/menScholarshipForm.pdf
M view/reports/printProCard.phtml
M view/reports/printSanction.phtml
M view/sanctionDetailRoster.html
M view/sanctionDetailVerify.html
M view/verifyMembership.phtml
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.
I dont mind going in and resetting each file manually, just unsure how to
fix my mistake. thanks
No comments:
Post a Comment