Welcome to Software Development on Codidact!
Will you help us build our independent community of developers helping developers? We're small and trying to grow. We welcome questions about all aspects of software development, from design to code to QA and more. Got questions? Got answers? Got code you'd like someone to review? Please join us.
Activity for SystemExplorerâ€
| Type | On... | Excerpt | Status | Date |
|---|---|---|---|---|
| Comment | Post #291969 |
I mean a process in git that turns two branches into one branch that combines the changes of the two branches.
(I think Michael's response is the right kind of answer; the only reason I haven't approved it is that I still haven't tested it, which I think it is good practice here.) (more) |
— | 4 months ago |
| Comment | Post #291970 |
The information that I'm asking for is how to do that. I don't think I ever said that git merge was the tool I wanted to use. What I want is the end result of the two branches have been merged. I am for the steps to get there. (more) |
— | 4 months ago |
| Comment | Post #291970 |
I'm not really sure what "incompatible" means here. I want to know the process for reviewing edits one by one and approving them or not, in order to get a coherent merge. Both sets of changes might be valid and useful, they just are doing different things. (more) |
— | 4 months ago |
| Comment | Post #291970 |
I think an explanation is needed of what it means to "Deal with the merge conflicts in an appropriate merge tool." (more) |
— | 4 months ago |
| Edit | Post #291969 | Initial revision | — | 4 months ago |
| Question | — |
What is the general process for merging two git branches, reviewing edits on each branch? Suppose you have a largish git repository with many files of different types (both text and images) distributed among a number of nested directories. Parallel development has occurred on two branches, each editing, creating, and removing files at various points within the directory tree. Now yo... (more) |
— | 4 months ago |