DEV Community

Discussion on: Keeping Your Branch Up to Date and Handling Merge Conflicts While Waiting for PR Reviews

Collapse
 
codergirl1991 profile image
Jessica Wilkins OpenSauced

Great article @bekahhw !

I remember the first time I ran into a merge conflict and I thought I did something wrong.

This is super helpful information for those just getting started. 😄

Collapse
 
bekahhw profile image
BekahHW OpenSauced

Thanks, Jessica! I had the same experience and I was super panicked.