Issues with Git 26) #995
learn also to → also learn how to
conflicts occurs → conflicts occur
into into master → into master
with master checked out, I don’t see the addDivideOperation branch in the History View, which is the view the instructions say to go to to do the merge. Should the user be doing merge from the addDivideOperation context menu in the Git Repositories View instead? Same thing for 1.3)
resolved until → resolved before
Team→Merge Tool asks which merge mode should be used. Which option should be picked?
After resolving conflicts with merge tool I still couldn’t stage the file using normal approaches. I had to do "add to index" in the context menu. Should the instructions be expanded to indicate user has to use that option? Or am I missing some way to explicitly declare the conflicts are resolved? The merge tool seems to let me do the conflict resolution but doesn’t seem to let me say "ok I’m done, things are resolved".
with with → with
Please login to write a comment.