deepak2431 / gitseries

0 stars 33 forks source link

Merging_issue_Priya_Aggarwal #84

Open priya8936 opened 4 years ago

priya8936 commented 4 years ago

I am not able to merge the changes I have made in my new branch. Screenshot (68)

priya8936 commented 4 years ago

Issue resolved. First, we have to add the file, then commit it and then proceed with the further steps of merging. Screenshot (69)

priya8936 commented 4 years ago

Screenshots regarding merge conflicts will be posted here

priya8936 commented 4 years ago

issue resolved Issue Resolved Merge successful