Tool/software: Code Composer Studio
Is there a step-by-step instructions on how to resolve GIT conflicts? I have done it but I have a feeling there must be a better way..
Basically the scenario is that I have GIT codebase, then user A makes commits while User B is making his own changes. As you know, this causes a conflict when User B commits (or tries to) his changes. It seems to me this is somehow too convoluted to resolve as this should be bread and butter of the git. So here's what I do:
- With User B fetch upstream changes to local repository
- (try to) commit and push my changes, which is rejected "rejected - non-fast-forward"
- From the git view right click on branch->local->branch_name and pick "merge", this shows a conflict
- Now here I'm not sure how to proceed "properly"
One way seems to be to open up the team synchronizing view that shows conflicts, not always but it does. This has option to merge all non-conflicting edits. For conflicting edits it gets annoying since there's no button to say "this change on the left overrides the change on the right!". I can of course NOT change the file on the left but then you cannot push it as the conflict remains. With a lot of faffing around I've usually managed to get out of this situation but this may leave source files with GIT tags and other badness.
What would be the 1-2-3 way to proceed from this point to achieve a) some changes from the remote are pulled into local while b) some changes from the local are pushed to remote?