Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I have 2 local branches called master and working. I have a couple of commits on working and one commit on master. I wanted to bring the changes from master to working.
I currently have the ‘working’ branch checked out. I tried rebasing with ‘master’. It showed one conflict file. I resolved the conflict and added the file to git. Now if I continue Rebase, i get the following error:
Could you please help me solve this problem?
the exceed file was coming because I had an installer exe. I just ignored the file and it resolved.