Communities

Writing
Writing
Codidact Meta
Codidact Meta
The Great Outdoors
The Great Outdoors
Photography & Video
Photography & Video
Scientific Speculation
Scientific Speculation
Cooking
Cooking
Electrical Engineering
Electrical Engineering
Judaism
Judaism
Languages & Linguistics
Languages & Linguistics
Software Development
Software Development
Mathematics
Mathematics
Christianity
Christianity
Code Golf
Code Golf
Music
Music
Physics
Physics
Linux Systems
Linux Systems
Power Users
Power Users
Tabletop RPGs
Tabletop RPGs
Community Proposals
Community Proposals
tag:snake search within a tag
answers:0 unanswered questions
user:xxxx search by author id
score:0.5 posts with 0.5+ score
"snake oil" exact phrase
votes:4 posts with 4+ votes
created:<1w created < 1 week ago
post_type:xxxx type of post
Search help
Notifications
Mark all as read See all your notifications »
Users Search
Help Dashboard Sign In Sign Up
Q&A Code Reviews Meta
Q&A
Posts Tags Edits
Ask Question

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.

Comments on What is the general process for merging two git branches, reviewing edits on each branch?

Post

What is the general process for merging two git branches, reviewing edits on each branch?

+9
−0

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 you want to merge the two branches, reviewing each of the edits to ensure that the correct information is preserved to maintain the desired content and functionality from each of the two branches.

What is the process for doing this?

git
posted 4 months ago
user card
SystemExplorer‭
46 reputation 1 0 9 0
History
Why does this post require attention from curators or moderators?
You might want to add some details to your flag.
Why should this post be closed?

1 comment thread

Merge or git merge? (3 comments)
Merge or git merge?
matthewsnyder‭ wrote 4 months ago
copy link

When you say "merge", do you mean as in "git merge" or just generally "combining changes"?

SystemExplorer‭ wrote 4 months ago
copy link

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.)

matthewsnyder‭ wrote 4 months ago
copy link

Sounds like you want to say "combining" :)

However, a technical detail in git is that if you literally want "two branches to become one", I think you really have no choice than git merge. git rebase etc. will not actually combine the branches, they copy changes from one branch to the other. It's kind of the same outcome, but the distinction may matter to you.