On Mon, 22 Aug 2011 04:18:58 -0700 (PDT) Sandeep Mahajan <sandeep.d.maha...@gmail.com> wrote:
> 1. Assume I have a central repo containing branches branchA. > 2. This repo is cloned by user A and userB. > 3. userA creates a new branchB where he merges in branchA. > 4. There is a conflict reported, and only userB has the skills to > resolve the conflict. > > Question: How can userB view the same conflicts, and get them resolved > in branchA? UserA pushes its BranchB to the server, UserB fetches it and then attempts to merge whatever UserA tried to merge into BranchB. After that, BranchB can be deleted from the server. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
