this post was submitted on 04 Apr 2026
14 points (79.2% liked)

Learn Programming

2153 readers
1 users here now

Posting Etiquette

  1. Ask the main part of your question in the title. This should be concise but informative.

  2. Provide everything up front. Don't make people fish for more details in the comments. Provide background information and examples.

  3. Be present for follow up questions. Don't ask for help and run away. Stick around to answer questions and provide more details.

  4. Ask about the problem you're trying to solve. Don't focus too much on debugging your exact solution, as you may be going down the wrong path. Include as much information as you can about what you ultimately are trying to achieve. See more on this here: https://xyproblem.info/

Icon base by Delapouite under CC BY 3.0 with modifications to add a gradient

founded 2 years ago
MODERATORS
Ategon@programming.dev
JaumeI@programming.dev
bugsmith@programming.dev
14
Where can I find documentations on how to resolve a git conflict properly? (lemmy.world)
submitted 1 week ago by ZILtoid1991@lemmy.world 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
[โ€“] AudaciousArmadillo@piefed.blahaj.zone 2 points 1 week ago (1 children)

As others have said, you need to at least learn the basics about git such as branches, remotes and merging. No plugin or tool will help you avoid that. When you feel very comfortable with the basics, I recommend learning how to rebase instead of merging for conflict resolution.

[โ€“] itsathursday@lemmy.world 1 points 1 week ago

Second this.

https://www.atlassian.com/git/tutorials/merging-vs-rebasing

You should also set it in your got config to pull.rebase true to avoid fast forwarding and other issues without being aware of how changes on main actually affect your branch changes and resolving them yourself so that your changes make actual sense when going into main.