T (they/she)

  • 16 Posts
  • 488 Comments
Joined 1 year ago
cake
Cake day: June 20th, 2023

help-circle



  • You pull the origin to your fork and solve the conflicts one by one, that’s usually how it goes.

    If you want to keep your files how they are you can select “accept local changes” instead of “accept incoming changes”. That’s it.

    Edit: If you need something more detailed let me know, I am assuming you are using an IDE like VSCode