15
Where can I find documentations on how to resolve a git conflict properly? (lemmy.world)
submitted 7 months ago by to c/learn_programming@programming.dev
14 comments fedilink hide all child comments
 

Today I did a git push --force, then I had to create a branch out of the old code, but other times I had to save the files I worked on, delete the local repository, git clone again, then reapply my fixes. I want to at least have a bookmark on how to fix things in the future.

Yes, I've heard about VSCode plugins, that supposed to help. But no, I don't want to use a glorified webpage to do coding, regardless if it's directly tied to Micro$lop, or some of the slop was removed by 3rd parties. I tried KATE once, I cannot go back to some sluggish webpage, which only argument for use at the moment is "but it has plugins".

you are viewing a single comment's thread
view the rest of the comments
[–] [S] -1 points 7 months ago (2 children)

I want to learn about that specific issue rather than spending months with learning less often used features of a software. People generally don't master all the available functions of a software before touching said software. Maybe in the sixties-seventies, but not anymore. And there's also the issue of people forgetting stuff, which will happen when my main interaction with git is pull and push.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 2 child comments
    •
  • [–] 1 point 7 months ago

    Check out the Atlassian docs for any git related topics or commands as they are usually easier to make sense of with example situations and explanations beyond describing just the feature or functionality.

  • permalink
  • fedilink
  • source
  • parent